Laclic
/
Souke
Прати 5
Волим 0
Креирај огранак 1
Код Дискусије 1 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

Adaptations frontend

refactoring
Guillaume Bourgeois пре 5 година
родитељ
3402406986
комит
d4846bd026
2 измењених фајлова са 128 додато и 112 уклоњено
Подељен поглед Покажи статистику Diff
  1. +112
    -105
      frontend/web/css/screen.css
  2. +16
    -7
      frontend/web/sass/screen.scss

+ 112
- 105
frontend/web/css/screen.css Прегледај датотеку

@@ -340,7 +340,11 @@ ul li {
background-color: #FF7F00;
color: white;
}
/* line 325, ../sass/screen.scss */
/* line 320, ../sass/screen.scss */
#header nav ul li ul li a {
padding: 10px 10px;
}
/* line 333, ../sass/screen.scss */
#header #link-logout .name {
color: gray;
font-size: 10px;
@@ -349,19 +353,19 @@ ul li {
top: -4px;
}

/* line 336, ../sass/screen.scss */
/* line 344, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
padding-top: 35px;
padding-bottom: 50px;
}
/* line 342, ../sass/screen.scss */
#content h1#title-site {
/* line 350, ../sass/screen.scss */
#content h1#title-site, #content h1 {
font-family: "highvoltageregular";
font-size: 50px;
font-size: 35px;
}
/* line 347, ../sass/screen.scss */
/* line 355, ../sass/screen.scss */
#content h2 {
color: #323232;
padding-bottom: 15px;
@@ -372,17 +376,17 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 358, ../sass/screen.scss */
/* line 366, ../sass/screen.scss */
#content h3 {
font-family: "highvoltageregular";
font-size: 20px;
color: #323232;
}
/* line 365, ../sass/screen.scss */
/* line 373, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 370, ../sass/screen.scss */
/* line 378, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -391,124 +395,123 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 377, ../sass/screen.scss */
/* line 385, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
padding-top: 40px;
}
/* line 382, ../sass/screen.scss */
/* line 390, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 10px 20px;
font-size: 20px;
text-transform: uppercase;
}
/* line 388, ../sass/screen.scss */
/* line 396, ../sass/screen.scss */
#content #row-signup a.btn-primary {
margin-right: 15px;
}
/* line 393, ../sass/screen.scss */
/* line 401, ../sass/screen.scss */
#content #row-presentation-distrib {
border-bottom: solid 1px #e0e0e0;
}
/* line 396, ../sass/screen.scss */
/* line 404, ../sass/screen.scss */
#content #row-presentation-distrib h2 {
font-family: "capsuularegular";
text-align: center;
margin-top: 0px;
text-transform: none;
}
/* line 404, ../sass/screen.scss */
/* line 412, ../sass/screen.scss */
#content #row-users-producers {
margin-bottom: 50px;
padding-top: 30px;
}
/* line 408, ../sass/screen.scss */
/* line 416, ../sass/screen.scss */
#content #row-users-producers h2 {
text-align: left;
margin-bottom: 10px;
margin-top: 0px;
}
/* line 412, ../sass/screen.scss */
/* line 420, ../sass/screen.scss */
#content #row-users-producers h2 .img {
height: 35px;
}
/* line 415, ../sass/screen.scss */
/* line 423, ../sass/screen.scss */
#content #row-users-producers h2 span {
margin-left: 10px;
font-size: 25px;
position: relative;
top: 5px;
}
/* line 423, ../sass/screen.scss */
/* line 431, ../sass/screen.scss */
#content #row-users-producers h3 {
margin-top: 0px;
}
/* line 427, ../sass/screen.scss */
/* line 435, ../sass/screen.scss */
#content #row-users-producers p.presentation {
font-family: "capsuularegular";
color: black;
font-size: 20px;
line-height: 26px;
}
/* line 434, ../sass/screen.scss */
/* line 442, ../sass/screen.scss */
#content #row-users-producers ul {
text-align: left;
}
/* line 436, ../sass/screen.scss */
/* line 444, ../sass/screen.scss */
#content #row-users-producers ul li {
color: #FF7F00;
}
/* line 441, ../sass/screen.scss */
/* line 449, ../sass/screen.scss */
#content #row-users-producers p {
padding-bottom: 4px;
}
/* line 445, ../sass/screen.scss */
/* line 453, ../sass/screen.scss */
#content #row-users-producers .btn-primary {
margin-top: 20px;
}
/* line 452, ../sass/screen.scss */
/* line 460, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}

/* line 462, ../sass/screen.scss */
/* line 470, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 466, ../sass/screen.scss */
/* line 474, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 472, ../sass/screen.scss */
/* line 480, ../sass/screen.scss */
#content #contact .form-control:focus {
/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
border-color: $jaune ;*/
}
/* line 477, ../sass/screen.scss */
/* line 485, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 481, ../sass/screen.scss */
/* line 489, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 484, ../sass/screen.scss */
/* line 492, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 491, ../sass/screen.scss */
/* line 499, ../sass/screen.scss */
#bookmarked-producers {
background-color: #FF7F00;
border-top: solid 1px #e0e0e0;
background-color: #323232;
padding: 0px;
padding-top: 20px;
margin: 0px;
}
/* line 498, ../sass/screen.scss */
/* line 505, ../sass/screen.scss */
#bookmarked-producers h2 {
font-family: "highvoltageregular";
color: white;
@@ -519,23 +522,23 @@ ul li {
margin-left: 15px;
margin-bottom: 15px;
}
/* line 509, ../sass/screen.scss */
/* line 516, ../sass/screen.scss */
#bookmarked-producers .col-md-12, #bookmarked-producers .col-md-6, #bookmarked-producers .col-md-3 {
float: left;
}
/* line 513, ../sass/screen.scss */
/* line 520, ../sass/screen.scss */
#bookmarked-producers .col-md-12 .producer {
background-size: 920px auto;
}
/* line 516, ../sass/screen.scss */
/* line 523, ../sass/screen.scss */
#bookmarked-producers .col-md-6 .producer {
background-size: 460px auto;
}
/* line 520, ../sass/screen.scss */
/* line 527, ../sass/screen.scss */
#bookmarked-producers .col-md-3 .producer {
background-size: 230px auto;
}
/* line 524, ../sass/screen.scss */
/* line 531, ../sass/screen.scss */
#bookmarked-producers .producer {
position: relative;
height: 100px;
@@ -546,41 +549,45 @@ ul li {
background-position: center center;
background-repeat: no-repeat;
border: solid 1px white;
background-color: white;
}
/* line 535, ../sass/screen.scss */
/* line 543, ../sass/screen.scss */
#bookmarked-producers .producer a {
position: absolute;
bottom: 0px;
left: 0px;
width: 100%;
background-color: white;
border-color: white;
color: #FF7F00;
background-color: #FF7F00;
border-color: #FF7F00;
color: white;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 544, ../sass/screen.scss */
/* line 553, ../sass/screen.scss */
#bookmarked-producers .producer a:hover {
background-color: #fafafa;
border-color: white;
color: #FF7F00;
}
/* line 552, ../sass/screen.scss */
/* line 561, ../sass/screen.scss */
#bookmarked-producers #discover {
padding-bottom: 20px;
text-align: center;
}
/* line 556, ../sass/screen.scss */
/* line 565, ../sass/screen.scss */
#bookmarked-producers #discover p {
padding-bottom: 0px;
color: white;
}
/* line 561, ../sass/screen.scss */
/* line 570, ../sass/screen.scss */
#bookmarked-producers #discover .btn {
background-color: white;
color: #FF7F00;
border: solid 1px white;
}

/* line 570, ../sass/screen.scss */
/* line 579, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -591,7 +598,7 @@ ul li {
background-color: white;
border-top: solid 1px #e0e0e0;
}
/* line 580, ../sass/screen.scss */
/* line 589, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
@@ -603,33 +610,33 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 590, ../sass/screen.scss */
/* line 599, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 594, ../sass/screen.scss */
/* line 603, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}
/* line 600, ../sass/screen.scss */
/* line 609, ../sass/screen.scss */
#footer #code-source img {
height: 20px;
}

/* line 606, ../sass/screen.scss */
/* line 615, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 609, ../sass/screen.scss */
/* line 618, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 614, ../sass/screen.scss */
/* line 623, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 618, ../sass/screen.scss */
/* line 627, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -637,7 +644,7 @@ ul li {
line-height: 35px;
font-family: "highvoltageregular";
}
/* line 626, ../sass/screen.scss */
/* line 635, ../sass/screen.scss */
#content #mentions h3 {
font-family: "highvoltageregular";
font-size: 18px;
@@ -646,53 +653,53 @@ ul li {
color: black;
}

/* line 641, ../sass/screen.scss */
/* line 650, ../sass/screen.scss */
.vegas-loading {
display: none;
}

/* line 648, ../sass/screen.scss */
/* line 657, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 652, ../sass/screen.scss */
/* line 661, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 657, ../sass/screen.scss */
/* line 666, ../sass/screen.scss */
#profil-user #mails-days-distribution .form-group {
float: left;
margin-right: 15px;
}
/* line 660, ../sass/screen.scss */
/* line 669, ../sass/screen.scss */
#profil-user #mails-days-distribution .form-group label {
font-weight: normal;
}
/* line 666, ../sass/screen.scss */
/* line 675, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* login */
/* line 675, ../sass/screen.scss */
/* line 684, ../sass/screen.scss */
.site-login .col-lg-5 {
margin: 0px auto;
float: none;
}

/* signup */
/* line 683, ../sass/screen.scss */
/* line 692, ../sass/screen.scss */
.modal-backdrop {
z-index: 999;
}

/* line 688, ../sass/screen.scss */
/* line 697, ../sass/screen.scss */
.site-signup .col-lg-5 {
margin: 0px auto;
float: none;
}

/* line 698, ../sass/screen.scss */
/* line 707, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -700,37 +707,37 @@ ul li {
margin-top: 0px;
}

/* line 708, ../sass/screen.scss */
/* line 717, ../sass/screen.scss */
#form-signup #user-producer {
margin-bottom: 30px;
}
/* line 713, ../sass/screen.scss */
/* line 722, ../sass/screen.scss */
#form-signup #signupform-id_producer option:disabled {
font-weight: bold;
color: black;
}
/* line 719, ../sass/screen.scss */
/* line 728, ../sass/screen.scss */
#form-signup #champs-producer {
display: none;
}
/* line 723, ../sass/screen.scss */
/* line 732, ../sass/screen.scss */
#form-signup #buttons-signup {
margin-top: 30px;
}

/* line 728, ../sass/screen.scss */
/* line 737, ../sass/screen.scss */
#col-left {
padding: 0px;
z-index: 15;
}
/* line 732, ../sass/screen.scss */
/* line 741, ../sass/screen.scss */
#col-left .affix {
width: 25%;
border-right: solid 1px #e0e0e0;
background-color: #FAFAFA;
height: 100%;
}
/* line 739, ../sass/screen.scss */
/* line 748, ../sass/screen.scss */
#col-left #link-home {
text-decoration: none;
font-size: 22px;
@@ -739,28 +746,28 @@ ul li {
padding: 10px;
background-color: white;
}
/* line 747, ../sass/screen.scss */
/* line 756, ../sass/screen.scss */
#col-left #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 753, ../sass/screen.scss */
/* line 762, ../sass/screen.scss */
#col-left #link-home .text {
padding-left: 62px;
}
/* line 756, ../sass/screen.scss */
/* line 765, ../sass/screen.scss */
#col-left #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 761, ../sass/screen.scss */
/* line 770, ../sass/screen.scss */
#col-left #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #FF7F00;
}
/* line 769, ../sass/screen.scss */
/* line 778, ../sass/screen.scss */
#col-left h2 {
font-family: "myriadpro-regular";
color: black;
@@ -768,37 +775,37 @@ ul li {
margin-bottom: 10px;
padding: 15px 0px 5px 15px;
}
/* line 777, ../sass/screen.scss */
/* line 786, ../sass/screen.scss */
#col-left #links {
background-color: white;
margin-bottom: 20px;
}
/* line 783, ../sass/screen.scss */
/* line 792, ../sass/screen.scss */
#col-left #links ul li a {
text-align: center;
border-right: solid 1px #e0e0e0;
}
/* line 787, ../sass/screen.scss */
/* line 796, ../sass/screen.scss */
#col-left #links ul li a:hover {
background-color: #FF7F00;
color: white;
}
/* line 793, ../sass/screen.scss */
/* line 802, ../sass/screen.scss */
#col-left #links ul li:last-child a {
border-right: 0px none;
}
/* line 803, ../sass/screen.scss */
/* line 812, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li a {
padding-left: 50px;
height: 40px;
}
/* line 809, ../sass/screen.scss */
/* line 818, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li.active a {
background-color: #FF7F00;
position: relative;
color: white;
}
/* line 814, ../sass/screen.scss */
/* line 823, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li.active a:after {
right: -40px;
top: 50%;
@@ -813,18 +820,18 @@ ul li {
border-width: 20px;
margin-top: -20px;
}
/* line 833, ../sass/screen.scss */
/* line 842, ../sass/screen.scss */
#col-left ul {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 837, ../sass/screen.scss */
/* line 846, ../sass/screen.scss */
#col-left ul li {
margin: 0px;
padding: 0px;
}
/* line 840, ../sass/screen.scss */
/* line 849, ../sass/screen.scss */
#col-left ul li a {
text-decoration: none;
font-family: "comfortaaregular";
@@ -835,18 +842,18 @@ ul li {
display: block;
color: black;
}
/* line 850, ../sass/screen.scss */
/* line 859, ../sass/screen.scss */
#col-left ul li a span.name, #col-left ul li a span.wording {
display: none;
}
/* line 857, ../sass/screen.scss */
/* line 866, ../sass/screen.scss */
#col-left p {
padding: 20px;
padding-top: 0px;
color: gray;
}

/* line 865, ../sass/screen.scss */
/* line 874, ../sass/screen.scss */
#content .header-title {
height: 79px;
padding: 20px 20px;
@@ -861,7 +868,7 @@ ul li {
-webkit-box-shadow: 0px 0px 8px #e0e0e0;
box-shadow: 0px 0px 8px #e0e0e0;
}
/* line 877, ../sass/screen.scss */
/* line 886, ../sass/screen.scss */
#content .header-title h1 {
color: black;
font-family: "myriadpro-regular";
@@ -869,7 +876,7 @@ ul li {
font-size: 25px;
text-transform: uppercase;
}
/* line 885, ../sass/screen.scss */
/* line 894, ../sass/screen.scss */
#content .header-title h2 {
color: gray;
text-transform: none;
@@ -878,16 +885,16 @@ ul li {
line-height: 20px;
}

/* line 896, ../sass/screen.scss */
/* line 905, ../sass/screen.scss */
.header-producer {
z-index: 1;
}
/* line 898, ../sass/screen.scss */
/* line 907, ../sass/screen.scss */
.header-producer #block-main-img {
height: 144px;
overflow: hidden;
}
/* line 902, ../sass/screen.scss */
/* line 911, ../sass/screen.scss */
.header-producer #block-main-img #main-img {
width: 100%;
height: auto;
@@ -897,7 +904,7 @@ ul li {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 911, ../sass/screen.scss */
/* line 920, ../sass/screen.scss */
.header-producer h1 {
font-family: "comfortaaregular";
text-align: center;
@@ -905,23 +912,23 @@ ul li {
top: 30px;
left: 40px;
}
/* line 918, ../sass/screen.scss */
/* line 927, ../sass/screen.scss */
.header-producer h1 span {
background-color: rgba(255, 255, 255, 0.8);
padding: 10px 30px;
border: dotted 1px black;
}

/* line 929, ../sass/screen.scss */
/* line 938, ../sass/screen.scss */
nav#menu-producer {
border-bottom: solid 1px #e0e0e0;
}
/* line 933, ../sass/screen.scss */
/* line 942, ../sass/screen.scss */
nav#menu-producer ul li {
padding: 0px;
margin: 0px;
}
/* line 936, ../sass/screen.scss */
/* line 945, ../sass/screen.scss */
nav#menu-producer ul li a {
border-right: solid 1px #e0e0e0;
text-decoration: none;
@@ -929,13 +936,13 @@ nav#menu-producer ul li a {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 941, ../sass/screen.scss */
/* line 950, ../sass/screen.scss */
nav#menu-producer ul li a:hover {
background-color: #FF7F00;
color: white;
}

/* line 951, ../sass/screen.scss */
/* line 960, ../sass/screen.scss */
.site-contact .col-lg-5 {
margin: 0px auto;
float: none;

+ 16
- 7
frontend/web/sass/screen.scss Прегледај датотеку

@@ -315,6 +315,14 @@ ul {
}
ul {
li {
a {
padding: 10px 10px ;
}
}
}
}
}
@@ -339,9 +347,9 @@ ul {
padding-top: 35px ;
padding-bottom: 50px ;
h1#title-site {
h1#title-site, h1 {
font-family: "highvoltageregular" ;
font-size: 50px ;
font-size: 35px ;
}
h2 {
@@ -489,8 +497,7 @@ ul {
}

#bookmarked-producers {
background-color: $color1 ;
border-top: solid 1px #e0e0e0 ;
background-color: #323232 ;
padding: 0px ;
padding-top: 20px ;
margin: 0px ;
@@ -531,15 +538,17 @@ ul {
background-position: center center ;
background-repeat: no-repeat ;
border: solid 1px $color2 ;
background-color: white ;

a {
position: absolute ;
bottom: 0px ;
left: 0px ;
width: 100% ;
background-color: $color2 ;
border-color: $color2 ;
color: $color1 ;
background-color: $color1 ;
border-color: $color1 ;
color: white ;
@include border-radius(0px) ;
&:hover {
background-color: #fafafa ;

Write Preview
Loading…
Откажи
Сачувај