From 113ccc2a62b895321a567088ab0a322260d6b45e Mon Sep 17 00:00:00 2001 From: Philippe Barbosa Date: Thu, 3 Mar 2016 19:26:17 +0100 Subject: [PATCH] General styles --- app/festival/static/css/index.css | 345 +++++++++++++----- app/festival/static/scss/base/_buttons.scss | 25 +- app/festival/static/scss/base/_layout.scss | 4 +- .../scss/components/_utilities-layout.scss | 20 + .../static/scss/config/_variables.scss | 2 +- app/festival/static/scss/index.scss | 5 +- 6 files changed, 309 insertions(+), 92 deletions(-) diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index 4108cca5..90a9f934 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -515,7 +515,7 @@ body { } /* line 30, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_defaults.scss */ -.clearfix:after, .container:after, .row:after, .row-box:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .media:after, .split-container:after { +.clearfix:after, .container:after, .row:after, .row-box:after, .sticked-form:after, .banner:after, .header:after, .navigation:after, .footer-nav:after, .media:after, .split-container:after { content: ""; display: table; clear: both; @@ -791,7 +791,7 @@ pre > p { /* line 27, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ .main { display: block; - margin: 0 auto; + margin: 0 auto 3rem; } /* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ @@ -932,7 +932,7 @@ input:not([type]), select[multiple=multiple], textarea { background-color: #fff; - border: 1px solid #95a5a6; + border: 1px solid #f4e7c8; border-radius: 0px; box-shadow: 0; box-sizing: border-box; @@ -944,27 +944,6 @@ textarea { -webkit-appearance: none; } -/* line 75, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ -input[type="color"]:hover, -input[type="date"]:hover, -input[type="datetime"]:hover, -input[type="datetime-local"]:hover, -input[type="email"]:hover, -input[type="month"]:hover, -input[type="number"]:hover, -input[type="password"]:hover, -input[type="search"]:hover, -input[type="tel"]:hover, -input[type="text"]:hover, -input[type="time"]:hover, -input[type="url"]:hover, -input[type="week"]:hover, -input:not([type]):hover, -select[multiple=multiple]:hover, -textarea:hover { - border-color: #798d8f; -} - /* line 79, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ input[type="color"]:focus, input[type="date"]:focus, @@ -1053,37 +1032,27 @@ select { */ /* line 140, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form { - margin: 0 auto; + margin: 0 auto 1rem; width: 100%; } -/* line 147, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 149, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input { - font: 300 1rem #333; - width: auto; + font: 300 1rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; + border-color: #e4c073; + float: left; + width: 70%; height: 2.5rem; line-height: 2.5rem; margin: 0; padding: 0 1rem; + border-right: none; } -/* line 159, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ -.sticked-form input[type=email] { - border-radius: 0px 0px 0 0; - width: 100%; - transition: background .2s; -} - -/* line 173, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ -.sticked-form input[type=email]:focus { - outline: 0; -} - -/* line 177, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 165, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input[type=submit] { width: 100%; -webkit-appearance: none; - border-radius: 0 0 0px 0px; font-weight: 700; color: #fff; border: 0; @@ -1091,21 +1060,63 @@ select { margin-top: 0; } -/* line 193, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 179, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input[type=submit]:hover { background: #ecd49d; } -/* line 196, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 182, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input[type=submit]:active { outline: 0; background: #e4c073; } +/* + * Custom select + */ +/* line 193, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +.select { + padding: 0; + margin: 0; + border: 1px solid #ccc; + width: 100%; + overflow: hidden; + background-color: #fff; + background: #fff url("http://www.scottgood.com/jsg/blog.nsf/images/arrowdown.gif") no-repeat 90% 50%; +} + +/* line 202, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +.select.search__form__select { + display: block; + float: left; + padding: 0 .5rem; + height: 2.5rem; + line-height: 2.5rem; + width: 30%; +} + +/* line 215, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +.select select { + width: 130%; + border: none; + box-shadow: none; + background-color: transparent; + background-image: none; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + text-align: center; +} + +/* line 226, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +.select select:focus { + outline: none; +} + /** * Reset input buttons styles */ -/* line 208, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 234, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ button, input[type="button"], input[type="reset"], @@ -1135,7 +1146,7 @@ button { margin-top: 1rem; } -/* line 233, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 259, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ button:hover, button:focus, input[type="button"]:hover, input[type="button"]:focus, @@ -1145,11 +1156,11 @@ input[type="submit"]:hover, input[type="submit"]:focus, button:hover, button:focus { - background-color: #e0b75d; + background-color: #e4c073; color: #fff; } -/* line 239, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ +/* line 265, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ button:disabled, input[type="button"]:disabled, input[type="reset"]:disabled, @@ -1171,7 +1182,7 @@ button:disabled { font-size: .75rem; cursor: pointer; border: 1px solid #e4c073; - margin: .5rem; + margin: .5rem 0; padding-top: 0; padding-bottom: 0; line-height: 3; @@ -1187,7 +1198,7 @@ button:disabled { /* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn:hover, .artist__event__cta:hover { text-decoration: none; - background-color: #e0b75d; + background-color: #e4c073; color: #fff; } @@ -1196,31 +1207,36 @@ button:disabled { outline: none; } +/* line 49, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.btn + .btn, .artist__event__cta + .btn, .btn + .artist__event__cta, .artist__event__cta + .artist__event__cta { + margin-left: .5rem; +} + /** * Sizes */ -/* line 53, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-small { padding-right: 0.5rem; padding-left: 0.5rem; line-height: 2; } -/* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 63, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-large { padding-right: 1.5rem; padding-left: 1.5rem; line-height: 4; } -/* line 65, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 69, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-huge { padding-right: 2rem; padding-left: 2rem; line-height: 5; } -/* line 71, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 75, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-full { width: 100%; padding-right: 0; @@ -1231,51 +1247,51 @@ button:disabled { /** * Colors */ -/* line 82, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 86, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-success { border: 1px solid #29b765; background-color: #2ecc71; } -/* line 85, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 89, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-success:hover { background-color: #29b765; } -/* line 90, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 94, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-error { border: 1px solid #e43725; background-color: #e74c3c; } -/* line 93, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 97, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-error:hover { background-color: #e43725; } -/* line 98, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 102, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-warning { border: 1px solid #e08e0b; background-color: #f39c12; } -/* line 101, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 105, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-warning:hover { background-color: #e08e0b; } -/* line 106, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 110, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-info { border: 1px solid #258cd1; background-color: #3498db; } -/* line 109, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 113, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-info:hover { background-color: #258cd1; } -/* line 114, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 118, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-inverse, .btn-inverse:hover { background: #f1f1f1; @@ -1283,7 +1299,7 @@ button:disabled { border: 1px solid #f1f1f1; } -/* line 121, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +/* line 125, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ .btn-disabled, .btn-disabled:hover, .btn-disabled:active, @@ -1292,6 +1308,30 @@ button:disabled { cursor: text; } +/* line 134, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.btn-twitter { + background: #55acee; + color: white; + border-color: #2795e9; +} + +/* line 138, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.btn-twitter:hover { + background-color: #2795e9; +} + +/* line 143, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.btn-facebook { + background: #3b5998; + color: white; + border-color: #2d4373; +} + +/* line 147, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_buttons.scss */ +.btn-facebook:hover { + background-color: #2d4373; +} + /** * Core styles */ @@ -1457,8 +1497,8 @@ th { display: inline-block; padding: 0.5rem 1rem; margin: 0 auto; - color: #d7a433; - font: 400 1.2rem "Triplex", Georgia, Times, "Times New Roman", serif; + color: #000; + font: 400 0.9rem "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; text-transform: uppercase; } @@ -1518,47 +1558,76 @@ th { font-size: .75rem; text-align: center; font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; - color: #fff; + color: #b48723; + text-transform: uppercase; } -/* line 57, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +/* line 58, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ .footer-nav { text-align: center; } -/* line 62, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +/* line 63, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ .footer-nav-left { float: left; } -/* line 66, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +/* line 67, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ .footer-nav-center { display: inline-block; *display: inline; *zoom: 1; } -/* line 72, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +/* line 73, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ .footer-nav-right { float: right; } /* _Theme ---------------------------------- */ -/* line 79, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ -.nav-footer { +/* line 80, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +.nav__footer { display: block; text-align: center; } -/* line 83, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ -.nav-footer ul { +/* line 84, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +.nav__footer ul { display: inline-block; *display: inline; *zoom: 1; padding: .3rem 1rem; } +/* line 91, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +.nav__footer__item { + width: 50%; +} + +/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ +.nav__footer__item__link { + padding: .75rem; + display: block; +} + +/* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ +.sidebar__title { + text-transform: uppercase; + display: block; + font-size: 1rem; + margin: 1.3rem 0 0.5rem; +} + +/* line 10, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_sidebar.scss */ +.sidebar__title:after { + content: ""; + display: block; + width: 100%; + height: 1px; + background: #e8ca88; +} + /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_menu-toggle.scss */ .menu__toggle { display: block; @@ -2023,6 +2092,28 @@ th { clear: left; } +/** + * Split for any div + */ +/* line 115, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_utilities-layout.scss */ +.this-or-this { + display: table; + width: 100%; + text-align: center; +} + +/* line 121, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_utilities-layout.scss */ +.this-or-this__this, +.this-or-this__or { + display: table-cell; + vertical-align: middle; +} + +/* line 127, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_utilities-layout.scss */ +.this-or-this__this { + width: 40%; +} + /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_embed-responsive.scss */ .embed-responsive { margin: 2rem 0 0; @@ -2107,15 +2198,72 @@ th { /* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ .artist__event__cta { - width: 20%; display: block; + width: 40%; margin: 1rem auto; text-align: center; } + +/* line 32, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ +.artist__portrait, .artist__portrait--left, .artist__portrait--right { + display: block; + margin: 1rem auto; +} + +/* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__card { + padding: 1rem; + background: #fff; +} + +/* line 6, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__name { + margin: 0 0 1rem; +} + +/* line 10, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__meta { + display: inline-block; + *display: inline; + *zoom: 1; + text-align: right; + padding: .3rem; + border: 1px solid #ecf0f1; + color: black; +} + +/* line 20, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__meta:before { + content: '\f041'; + font-family: "Font-Awesome"; + display: inline-block; + *display: inline; + *zoom: 1; + vertical-align: middle; + margin-right: .6rem; + font-size: 2rem; + color: #d7a433; +} + +/* line 1, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/user.scss */ +.user__panel { + margin: 1rem auto; + padding: .5rem 1rem; + background: #fff; +} @media (min-width: 769px) {/* line 140, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form { - width: 60%; - min-width: 430px; + width: 100%; + }/* line 91, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ + .nav__footer__item { + width: 33%; + }/* line 91, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ + .nav__footer__item { + padding: 1rem; + width: 25%; + }/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ + .nav__footer__item__link { + padding: 1rem; }/* line 42, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_utilities-layout.scss */ .box-item-50 { width: 50%; @@ -2128,6 +2276,21 @@ th { }/* line 60, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_utilities-layout.scss */ .box-item-20 { width: 20%; + }/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ + .artist__event__cta { + width: 30%; + }/* line 35, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ + .artist__portrait--left { + max-width: 40%; + margin-top: 0; + margin-right: 1rem; + float: left; + }/* line 45, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ + .artist__portrait--right { + max-width: 40%; + margin-top: 0; + margin-left: 1rem; + float: right; } } @media (min-width: 961px) {/* line 59, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_typography.scss */ @@ -2145,18 +2308,17 @@ th { .aside { float: left; width: 30%; - padding-left: .5rem; - }/* line 147, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ + padding: 0 .5rem; + }/* line 149, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input { - float: left; - }/* line 159, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ - .sticked-form input[type=email] { - width: 70%; - border-radius: 0px 0 0 0px; - }/* line 177, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ + width: 60%; + }/* line 165, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input[type=submit] { - width: 30%; + width: 20%; border-radius: 0 0px 0px 0; + }/* line 202, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ + .select.search__form__select { + width: 20%; }/* line 49, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_headers.scss */ .header__baseline { line-height: 85px; @@ -2176,6 +2338,12 @@ th { display: inline-block; display: inline; zoom: 1; + }/* line 91, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ + .nav__footer__item { + width: auto; + }/* line 104, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_footers.scss */ + .nav__footer__item__link { + padding: .5rem; }/* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/components/_menu-toggle.scss */ .menu__toggle { display: none; @@ -2198,6 +2366,9 @@ th { .artist__item__name { padding: 0.8rem; font-size: 0.8rem; + }/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/artist-detail.scss */ + .artist__event__cta { + width: 20%; } } @media (min-width: 1200px) {/* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ diff --git a/app/festival/static/scss/base/_buttons.scss b/app/festival/static/scss/base/_buttons.scss index 41f849f9..9d958c0e 100755 --- a/app/festival/static/scss/base/_buttons.scss +++ b/app/festival/static/scss/base/_buttons.scss @@ -14,7 +14,7 @@ font-size:.75rem; cursor:pointer; border:1px solid darken($base_btn_background_color, 5); - margin:.5rem; + margin:.5rem 0; padding-top:0; padding-bottom:0; line-height:3; @@ -46,6 +46,10 @@ } } +.btn + .btn { + margin-left: .5rem; +} + /** * Sizes @@ -124,4 +128,23 @@ .btn-disabled:focus{ opacity: 0.4; cursor:text; +} + +// Social buttons +.btn-twitter { + background: $color-twitter; + color: white; + border-color: darken($color-twitter , 10); + &:hover { + background-color: darken($color-twitter , 10); + } +} + +.btn-facebook { + background: $color-facebook; + color: white; + border-color: darken($color-facebook , 10); + &:hover { + background-color: darken($color-facebook , 10); + } } \ No newline at end of file diff --git a/app/festival/static/scss/base/_layout.scss b/app/festival/static/scss/base/_layout.scss index 23a16bfc..3c95bc43 100755 --- a/app/festival/static/scss/base/_layout.scss +++ b/app/festival/static/scss/base/_layout.scss @@ -26,7 +26,7 @@ .main { display: block; - margin: 0 auto; + margin: 0 auto 3rem; @media (min-width : $desktop ) { float: left; width: 70%; @@ -39,7 +39,7 @@ @media (min-width : $desktop ) { float: left; width: 30%; - padding-left: .5rem; + padding: 0 .5rem; } } diff --git a/app/festival/static/scss/components/_utilities-layout.scss b/app/festival/static/scss/components/_utilities-layout.scss index 489eb4a8..85c2b076 100755 --- a/app/festival/static/scss/components/_utilities-layout.scss +++ b/app/festival/static/scss/components/_utilities-layout.scss @@ -106,4 +106,24 @@ text-align:left; float:left; clear:left; +} + + +/** + * Split for any div + */ +.this-or-this { + display: table; + width: 100%; + text-align: center; +} + +.this-or-this__this, +.this-or-this__or { + display: table-cell; + vertical-align: middle; +} + +.this-or-this__this { + width: 40%; } \ No newline at end of file diff --git a/app/festival/static/scss/config/_variables.scss b/app/festival/static/scss/config/_variables.scss index 60e905cf..c808ebc9 100755 --- a/app/festival/static/scss/config/_variables.scss +++ b/app/festival/static/scss/config/_variables.scss @@ -102,7 +102,7 @@ $base_btn_color : $black; $base_btn_background_color : $main_color; $base_btn_hover_color : $white; -$base_btn_hover_background_color : darken($base_btn_background_color, 10); +$base_btn_hover_background_color : darken($base_btn_background_color, 5); $button_uppercase : true; diff --git a/app/festival/static/scss/index.scss b/app/festival/static/scss/index.scss index f0d9aa53..4f7acfde 100755 --- a/app/festival/static/scss/index.scss +++ b/app/festival/static/scss/index.scss @@ -49,6 +49,7 @@ */ @import 'components/headers', 'components/footers', + 'components/sidebar', 'components/menu-toggle', 'components/breadcrumbs', 'components/pagination', @@ -67,4 +68,6 @@ * _Modules */ @import 'modules/artist-card', - 'modules/artist-detail'; \ No newline at end of file + 'modules/artist-detail', + 'modules/event-card', + 'modules/user'; \ No newline at end of file -- 2.39.5