From e26bbcc8cf753c33391aed71aa0a1bc488f3a126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Arag=C3=B3n?= Date: Fri, 5 Apr 2019 16:29:16 -0500 Subject: [PATCH] fix scss course home - refs #2681 --- assets/css/scss/_base.scss | 21 +++++++++++-------- assets/css/scss/_variables.scss | 2 +- .../user_portal/list_courses.html.twig | 2 +- .../views/Layout/layout_one_col.html.twig | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss index 83b6491091..913701f07f 100755 --- a/assets/css/scss/_base.scss +++ b/assets/css/scss/_base.scss @@ -100,7 +100,10 @@ hr { margin-bottom: 10px; } .tab-content{ - margin-top: 10px; + margin-top: 1rem !important; + &.card-body{ + padding: 0.5rem; + } } /****** BOOTSTRAP SELECT ******/ @@ -540,6 +543,8 @@ hr { border-bottom: 1px solid #e5e9f2; .card-title{ margin-bottom: 0; + font-weight: normal; + color: #316dab; } } } @@ -781,9 +786,9 @@ hr { display: grid; grid-gap: 1rem; grid-row-gap: 16px; - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(3, 1fr); @include large($breakpoint-xl){ - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(3, 1fr); } @include portrait($breakpoint-sm, $breakpoint-md){ grid-template-columns: repeat(2, 1fr); @@ -820,7 +825,7 @@ hr { padding: 0.8rem; } .title{ - font-size: 14px; + font-size: 16px; } } } @@ -987,9 +992,7 @@ hr { .card-title a { display: block; position: relative; - color: $grey-900; - font-size: 16px; - font-weight: bold; + font-size: 18px; margin-bottom: 15px; padding: 10px 5px; border: none; @@ -1032,7 +1035,7 @@ hr { font-size: 20px; line-height: 20px; position: absolute; - top: 18px; + top: 14px; right: 10px; } &.collapsed:after { @@ -1132,7 +1135,7 @@ hr { left: 44%; margin-left: -32px; text-align: center; - border: 2px solid rgba(0, 188, 212, 0.37) ; + border: 2px solid rgba(216, 216, 216, 0.37); box-shadow: 0 0.25rem 0.5rem rgba(0,0,0,.16); border-radius: 10px; &:hover{ diff --git a/assets/css/scss/_variables.scss b/assets/css/scss/_variables.scss index c68eac2427..8e840ca767 100755 --- a/assets/css/scss/_variables.scss +++ b/assets/css/scss/_variables.scss @@ -40,7 +40,7 @@ $default-black : #000000; // --------------------------------------------------------- // linear-gradient(120deg, #00a5e4, #4a71d0); -$page-background : #fcfcfc; +$page-background : #FFFFFF; $menu-background : #FFFFFF; $menu-secondary : #ff3c7e; diff --git a/main/template/default/user_portal/list_courses.html.twig b/main/template/default/user_portal/list_courses.html.twig index 2ff32152a9..f1bc287fea 100644 --- a/main/template/default/user_portal/list_courses.html.twig +++ b/main/template/default/user_portal/list_courses.html.twig @@ -49,7 +49,7 @@ {% endif %} -
+
{% if item.visibility == constant('COURSE_VISIBILITY_CLOSED') and not item.current_user_is_teacher %} {{ item.title }} {{ item.code_course }} {% else %} diff --git a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig index 88e4e73b84..88ac909423 100644 --- a/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig +++ b/src/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig @@ -36,8 +36,8 @@ {% endblock %}
-
-
+
+
{% if introduction != '' %} {{ introduction }} {% endif %}