From fb9f847692dbcccf40e1bc0d045c5da4aa380fc7 Mon Sep 17 00:00:00 2001 From: thiagourias Date: Mon, 17 Jun 2019 16:30:24 -0300 Subject: [PATCH 1/8] =?UTF-8?q?Alteracoes=20Button=20mais=20informa=C3=A7?= =?UTF-8?q?=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/output/core/course_renderer.php | 4 ++-- scss/courselist.scss | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index bf6b606..1812931 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -243,8 +243,8 @@ class course_renderer extends \core_course_renderer { } // Display course summary. if ($course->has_summary()) { - $content .= html_writer::start_tag('div', array('class' => 'card-see-more text-center')); - $content .= html_writer::start_tag('div', array('class' => 'btn btn-secondary m-2', + $content .= html_writer::start_tag('div', array('class' => 'card-see-more text-center teste')); + $content .= html_writer::start_tag('div', array('class' => 'btn btn-mais-info m-2', 'id' => "course-popover-{$course->id}", 'role' => 'button', 'data-region' => 'popover-region-toggle', 'data-toggle' => 'popover', 'data-placement' => 'right', 'data-content' => $chelper->get_course_formatted_summary($course, diff --git a/scss/courselist.scss b/scss/courselist.scss index 74ba8b6..1e918d2 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -67,8 +67,8 @@ body#page-enrol-index { .popover { max-width: 100% !important; - width: 50% !important; -} + width: 60% !important; +} .minheight{ background-position: top center !important; @@ -84,4 +84,17 @@ body#page-enrol-index { -webkit-box-shadow: 0px 0px 14px -2px rgba(0,0,0,1); -moz-box-shadow: 0px 0px 14px -2px rgba(0,0,0,1); box-shadow: 0px 0px 14px -2px rgba(0,0,0,1); +} + +.btn-mais-info{ + color: white; + background-color: #0069d9; + border-color: #0069d9; + border-radius: 5px; +} + +.btn-mais-info:hover{ + -webkit-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); + -moz-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); + box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); } \ No newline at end of file From 122c74aad94941d6853309b7ab3e2e542c485ac5 Mon Sep 17 00:00:00 2001 From: thiagourias Date: Mon, 17 Jun 2019 17:08:34 -0300 Subject: [PATCH 2/8] Alteracoes layout --- classes/output/core/course_renderer.php | 4 ++- scss/courselist.scss | 33 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index 1812931..009af03 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -205,7 +205,9 @@ class course_renderer extends \core_course_renderer { $content .= $this->get_course_summary_image($course); $content .= html_writer::end_tag('a'); $content .= html_writer::start_tag('div', array('class' => 'card-body')); - $content .= "
". $coursenamelink ."
"; + + + $content .= "
". $coursenamelink ."
"; $content .= html_writer::end_tag('div'); $content .= html_writer::start_tag('div', array('class' => 'card-block text-center')); // Print enrolmenticons. diff --git a/scss/courselist.scss b/scss/courselist.scss index 1e918d2..9bb0eda 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -79,6 +79,15 @@ body#page-enrol-index { border: 1px solid #ccc; float: left; + background: #fff; /* Old browsers */ + background: -moz-radial-gradient(center, ellipse cover, #011c35 1%, #E0E0E0 100%); /* FF3.6+ */ + background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(1%,#fff), color-stop(100%,#E0E0E0)); /* Chrome,Safari4+ */ + background: -webkit-radial-gradient(center, ellipse cover, #fff 1%,#E0E0E0 100%); /* Chrome10+,Safari5.1+ */ + background: -o-radial-gradient(center, ellipse cover, #fff 1%,#E0E0E0 100%); /* Opera 12+ */ + background: -ms-radial-gradient(center, ellipse cover, #fff 1%,#E0E0E0 100%); /* IE10+ */ + background: radial-gradient(ellipse at center, #fff 1%,#E0E0E0 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0264d6', endColorstr='#1c2b5a',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ + } .boxCursos:hover { -webkit-box-shadow: 0px 0px 14px -2px rgba(0,0,0,1); @@ -90,6 +99,7 @@ body#page-enrol-index { color: white; background-color: #0069d9; border-color: #0069d9; + border-radius: 5px; } @@ -97,4 +107,27 @@ body#page-enrol-index { -webkit-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); -moz-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); +} + +.textCardEdited { + font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif; + font-size: 20px; + text-align: center; + text-transform: uppercase; + text-rendering: optimizeLegibility; + color: #444444; + text-shadow: 1px 0px 1px #CCCCCC, 0px 1px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 3px 2px 1px #CCCCCC, 2px 3px 1px #EEEEEE, 4px 3px 1px #CCCCCC, 3px 4px 1px #EEEEEE, 5px 4px 1px #CCCCCC, 4px 5px 1px #EEEEEE, 6px 5px 1px #CCCCCC, 5px 6px 1px #EEEEEE, 7px 6px 1px #CCCCCC; +} +.elegantshd { + color: #131313; + letter-spacing: .15em; +} + +a{ + color:#000000; + +} +a:hover{ + color:grey !important; + text-decoration: none !important; } \ No newline at end of file From 40fd28d73e5d1bcc54774df97ab695675c25f79e Mon Sep 17 00:00:00 2001 From: thiagourias Date: Mon, 17 Jun 2019 17:25:27 -0300 Subject: [PATCH 3/8] Alteracoes href --- classes/output/core/course_renderer.php | 2 +- scss/courselist.scss | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index 009af03..60184a0 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -200,7 +200,7 @@ class course_renderer extends \core_course_renderer { $coursename = $chelper->get_course_formatted_name($course); $courseurl = new moodle_url('/course/view.php', array('id' => $course->id)); $coursenamelink = html_writer::link($courseurl, - $coursename, array('class' => $course->visible ? '' : 'dimmed')); + $coursename, array('class' => $course->visible ? 'propertiesTextColor' : 'dimmed propertiesTextColor')); $content = html_writer::start_tag('a', array ('href' => $courseurl, 'class' => 'course-card-img')); $content .= $this->get_course_summary_image($course); $content .= html_writer::end_tag('a'); diff --git a/scss/courselist.scss b/scss/courselist.scss index 9bb0eda..dfda6fc 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -116,18 +116,18 @@ body#page-enrol-index { text-transform: uppercase; text-rendering: optimizeLegibility; color: #444444; - text-shadow: 1px 0px 1px #CCCCCC, 0px 1px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 3px 2px 1px #CCCCCC, 2px 3px 1px #EEEEEE, 4px 3px 1px #CCCCCC, 3px 4px 1px #EEEEEE, 5px 4px 1px #CCCCCC, 4px 5px 1px #EEEEEE, 6px 5px 1px #CCCCCC, 5px 6px 1px #EEEEEE, 7px 6px 1px #CCCCCC; + text-shadow: 1px 0px 1px #CCCCCC, 0px 1px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 2px 2px 1px #CCCCCC, 2px 2px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 3px 2px 1px #CCCCCC, 2px 3px 1px #EEEEEE, 3px 2px 1px #CCCCCC; } .elegantshd { color: #131313; letter-spacing: .15em; } -a{ - color:#000000; +.propertiesTextColor{ + color:#303030; } -a:hover{ - color:grey !important; +.propertiesTextColor:hover{ + color:#787878 !important; text-decoration: none !important; } \ No newline at end of file From 5ba286d1854404975844fba684546b3b3ebf92d5 Mon Sep 17 00:00:00 2001 From: thiagourias Date: Mon, 17 Jun 2019 17:35:36 -0300 Subject: [PATCH 4/8] Correcao popover responsivo --- scss/courselist.scss | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/scss/courselist.scss b/scss/courselist.scss index dfda6fc..a35c68e 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -6,6 +6,10 @@ min-width: calc(100% - 0.5rem) !important; max-width: calc(100% - 0.5rem) !important; } + .popover { + max-width: 100% !important; + width: 95% !important; + } } @media screen and @@ -15,7 +19,10 @@ min-width: calc(50% - 0.5rem) !important; max-width: calc(50% - 0.5rem) !important; } - + .popover { + max-width: 100% !important; + width: 80% !important; + } } @@ -26,13 +33,20 @@ min-width: calc(33% - 0.5rem) !important; max-width: calc(33% - 0.5rem) !important; } + .popover { + max-width: 100% !important; + width: 80% !important; + } } @media screen and (min-width: 1251px) and (max-width: 4080px){ - + .popover { + max-width: 100% !important; + width: 60% !important; + } } .course-card-view { @@ -65,10 +79,7 @@ body#page-enrol-index { } } -.popover { - max-width: 100% !important; - width: 60% !important; -} + .minheight{ background-position: top center !important; @@ -99,7 +110,6 @@ body#page-enrol-index { color: white; background-color: #0069d9; border-color: #0069d9; - border-radius: 5px; } From 79b3549db4dbfc5b40c1a9e629ec488a905ffcde Mon Sep 17 00:00:00 2001 From: thiagourias Date: Tue, 18 Jun 2019 13:40:49 -0300 Subject: [PATCH 5/8] =?UTF-8?q?Remo=C3=A7=C3=A3o=20de=20sombra=20e=20alter?= =?UTF-8?q?a=C3=A7=C3=A3o=20da=20letra=20-=20cursos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/courselist.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scss/courselist.scss b/scss/courselist.scss index a35c68e..ae99eef 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -121,12 +121,11 @@ body#page-enrol-index { .textCardEdited { font-family: "Avant Garde", Avantgarde, "Century Gothic", CenturyGothic, "AppleGothic", sans-serif; - font-size: 20px; + font-size: 16px; text-align: center; text-transform: uppercase; text-rendering: optimizeLegibility; color: #444444; - text-shadow: 1px 0px 1px #CCCCCC, 0px 1px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 2px 2px 1px #CCCCCC, 2px 2px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 2px 1px 1px #CCCCCC, 1px 2px 1px #EEEEEE, 3px 2px 1px #CCCCCC, 2px 3px 1px #EEEEEE, 3px 2px 1px #CCCCCC; } .elegantshd { color: #131313; From af72b75a97d1119fdfa29893b7cc21f0a14cf081 Mon Sep 17 00:00:00 2001 From: thiagourias Date: Tue, 18 Jun 2019 15:11:14 -0300 Subject: [PATCH 6/8] Alteracoes card --- classes/output/core/course_renderer.php | 5 +++++ scss/courselist.scss | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index 60184a0..bad9e2b 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -245,7 +245,11 @@ class course_renderer extends \core_course_renderer { } // Display course summary. if ($course->has_summary()) { + $content .= html_writer::start_tag('div', array('class' => 'card-see-more text-center teste')); + $content .= html_writer::start_tag('div', array('class' => 'btn btn-inscrever')); + $content .= 'Inscrever'; + $content .= html_writer::end_tag('div'); $content .= html_writer::start_tag('div', array('class' => 'btn btn-mais-info m-2', 'id' => "course-popover-{$course->id}", 'role' => 'button', 'data-region' => 'popover-region-toggle', 'data-toggle' => 'popover', 'data-placement' => 'right', @@ -253,6 +257,7 @@ class course_renderer extends \core_course_renderer { array('noclean' => true, 'para' => false)), 'data-html' => 'true', 'tabindex' => '0', 'data-trigger' => 'focus')); $content .= 'Mais informações'; $content .= html_writer::end_tag('div'); + $content .= html_writer::end_tag('div'); // End summary. } return $content; diff --git a/scss/courselist.scss b/scss/courselist.scss index ae99eef..39efb4b 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -89,7 +89,7 @@ body#page-enrol-index { transition: box-shadow .3s; border: 1px solid #ccc; float: left; - + max-height: 440px; background: #fff; /* Old browsers */ background: -moz-radial-gradient(center, ellipse cover, #011c35 1%, #E0E0E0 100%); /* FF3.6+ */ background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(1%,#fff), color-stop(100%,#E0E0E0)); /* Chrome,Safari4+ */ @@ -139,4 +139,22 @@ body#page-enrol-index { .propertiesTextColor:hover{ color:#787878 !important; text-decoration: none !important; +} + +.btn-inscrever{ + color: #fff; + background-color: #28a745; + border-color: #28a745; + border-radius: 5px; + margin-top: 10px; +} + +.btn-inscrever:hover{ + -webkit-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); + -moz-box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); + box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.58); +} + +.card-body{ + margin-bottom: 10px; } \ No newline at end of file From c3c9a1ab99d86b9cb26ed962824bf7c9a3d2dba5 Mon Sep 17 00:00:00 2001 From: thiagourias Date: Tue, 18 Jun 2019 15:17:51 -0300 Subject: [PATCH 7/8] =?UTF-8?q?Remo=C3=A7=C3=A3o=20=20icone=20inscrever?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/output/core/course_renderer.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index bad9e2b..7b799b5 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -205,21 +205,8 @@ class course_renderer extends \core_course_renderer { $content .= $this->get_course_summary_image($course); $content .= html_writer::end_tag('a'); $content .= html_writer::start_tag('div', array('class' => 'card-body')); - - $content .= "
". $coursenamelink ."
"; $content .= html_writer::end_tag('div'); - $content .= html_writer::start_tag('div', array('class' => 'card-block text-center')); - // Print enrolmenticons. - if ($icons = enrol_get_course_info_icons($course)) { - foreach ($icons as $pixicon) { - $content .= $this->render($pixicon); - } - } - $content .= html_writer::start_tag('div', array('class' => 'pull-right')); - $content .= html_writer::end_tag('div'); // End pull-right. - $content .= html_writer::end_tag('div'); // End card-block. - // Display course contacts. See core_course_list_element::get_course_contacts(). if ($course->has_course_contacts()) { $content .= html_writer::start_tag('div', array('class' => 'card-footer teachers')); $content .= html_writer::start_tag('ul'); From 59846a652927a30a3a28939cd22337bcd7df2b0a Mon Sep 17 00:00:00 2001 From: thiagourias Date: Tue, 18 Jun 2019 15:21:39 -0300 Subject: [PATCH 8/8] Alteracoes classse box --- classes/output/core/course_renderer.php | 2 +- scss/courselist.scss | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index 7b799b5..8fe4dc4 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -125,7 +125,7 @@ class course_renderer extends \core_course_renderer { $coursecount = 1; $content .= html_writer::start_tag('div', array('class' => ' row card-deck my-4')); foreach ($courses as $course) { - $content .= $this->coursecat_coursebox($chelper, $course, 'card mb-3 course-card-view boxCursos'); + $content .= $this->coursecat_coursebox($chelper, $course, 'card mb-3 course-card-view boxCursos tamanhoBoxCursos'); $coursecount ++; } $content .= html_writer::end_tag('div'); diff --git a/scss/courselist.scss b/scss/courselist.scss index 39efb4b..553acfd 100644 --- a/scss/courselist.scss +++ b/scss/courselist.scss @@ -89,7 +89,6 @@ body#page-enrol-index { transition: box-shadow .3s; border: 1px solid #ccc; float: left; - max-height: 440px; background: #fff; /* Old browsers */ background: -moz-radial-gradient(center, ellipse cover, #011c35 1%, #E0E0E0 100%); /* FF3.6+ */ background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(1%,#fff), color-stop(100%,#E0E0E0)); /* Chrome,Safari4+ */ @@ -100,6 +99,9 @@ body#page-enrol-index { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0264d6', endColorstr='#1c2b5a',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ } +.tamanhoBoxCursos{ + max-height: 440px; +} .boxCursos:hover { -webkit-box-shadow: 0px 0px 14px -2px rgba(0,0,0,1); -moz-box-shadow: 0px 0px 14px -2px rgba(0,0,0,1);