Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@keriat
keriat committed Oct 15, 2019
2 parents cacf9da + 122df37 commit a853ed4
Show file tree
Hide file tree
Showing 35 changed files with 4,139 additions and 560 deletions.
Binary file added _css-experiments/.sass-cache/b09db8efa8c0675207c3cb6881c8ff62200ea5b2/style-opt_clean.scssc
View file
Binary file not shown.
87 changes: 87 additions & 0 deletions _css-experiments/style-opt_clean.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
Error: Undefined variable: "$rosybrown_be73748c".
on line 1537 of style-opt_clean.scss
1532: color: $rosybrown_be7374;
1533: padding: 10px 0;
1534: line-height: 1.1;
1535:
1536: &:hover {
1537: color: $rosybrown_be73748c;
1538: }
1539: }
1540:
1541: .c_col {
1542: &:last-child {
Backtrace:
style-opt_clean.scss:1537
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/script/tree/variable.rb:49:in `_perform'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/script/tree/node.rb:50:in `perform'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:398:in `visit_prop'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `block in visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `block in with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:135:in `with_frame'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block (2 levels) in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `map'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:179:in `with_environment'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:438:in `visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `block in visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `block in with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:135:in `with_frame'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block (2 levels) in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `map'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:179:in `with_environment'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:438:in `visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `block in visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `block in with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:135:in `with_frame'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block (2 levels) in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `map'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:440:in `block in visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:179:in `with_environment'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:438:in `visit_rule'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `block in visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `block in with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:135:in `with_frame'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/stack.rb:79:in `with_base'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:158:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:52:in `block in visit_children'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:52:in `map'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:52:in `visit_children'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:167:in `block in visit_children'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:179:in `with_environment'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:166:in `visit_children'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `block in visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:186:in `visit_root'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/base.rb:36:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:157:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/visitors/perform.rb:10:in `visit'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/root_node.rb:36:in `css_tree'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/tree/root_node.rb:29:in `render_with_sourcemap'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/engine.rb:389:in `_render_with_sourcemap'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/engine.rb:307:in `render_with_sourcemap'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/exec/sass_scss.rb:387:in `run'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/exec/sass_scss.rb:63:in `process_result'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/exec/base.rb:50:in `parse'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/lib/sass/exec/base.rb:18:in `parse!'
C:/Programs/Ruby26-x64/lib/ruby/gems/2.6.0/gems/sass-3.7.4/bin/sass:13:in `<top (required)>'
C:/Programs/Ruby26-x64/bin/sass:23:in `load'
C:/Programs/Ruby26-x64/bin/sass:23:in `<main>'
*/
body:before {
white-space: pre;
font-family: monospace;
content: "Error: Undefined variable: \"$rosybrown_be73748c\".\A on line 1537 of style-opt_clean.scss\A \A 1532: color: $rosybrown_be7374;\A 1533: padding: 10px 0;\A 1534: line-height: 1.1;\A 1535: \A 1536: &:hover {\A 1537: color: $rosybrown_be73748c;\A 1538: }\A 1539: }\A 1540: \A 1541: .c_col {\A 1542: &:last-child {"; }
20 changes: 10 additions & 10 deletions _css-experiments/style-opt_clean.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ h5 {
text-decoration: underline;
}

.twa_in_hook {
/*.twa_in_hook {
&.carousel {
margin: 15px 0 !important;
Expand All @@ -1626,7 +1626,7 @@ h5 {
}
margin: 15px 0;
clear: both;
}
}*/

button {
&:-moz-focus-inner {
Expand Down Expand Up @@ -1686,7 +1686,7 @@ button {
}
}

.photo-banner-citrine {
/*.photo-banner-citrine {
.banner-item-content {
border-radius: 10px;
background: linear-gradient(0deg, $antiquewhite_f8e7d1 50%, #ffffff 50%);
Expand Down Expand Up @@ -1869,7 +1869,7 @@ button {
}
}
}
}
}*/

.custombanners {
&.displayHome {
Expand All @@ -1884,12 +1884,12 @@ button {
&.displayCustomBanners1 {
margin: 0 -12px -24px -12px;

.banner-item {
/* .banner-item {
background: $white_fff;
border-radius: 10px;
margin-bottom: 24px;
padding: 2.5rem;
}
} */

.custom-html {
a {
Expand Down Expand Up @@ -1957,15 +1957,15 @@ button {
}
}

.widget-ourservice {
/*.widget-ourservice {
margin: 0 12px 0;
.banner-item-content {
img {
width: 35%;
}
}
}
}*/

.custombanners {
&.displayHome {
Expand All @@ -1985,7 +1985,7 @@ button {
}
}

.photo-banner-citrine {
/*.photo-banner-citrine {
.banner-item-content {
padding: 70px 50px 30px !important;
Expand Down Expand Up @@ -2015,7 +2015,7 @@ button {
.banner-item-content {
padding: 0 0 30px !important;
}
}
}*/

.grey-note {
display: block;
Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters.yml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
parameters:
parameters:
31 changes: 14 additions & 17 deletions themes/cadouri/_dev/css/cadouri/_breadcrumb.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,6 @@
}

//magic-zoom
.mfp-figure figure {
margin: 0 !important
}

.block-lastest-cms {
display: block;
Expand Down Expand Up @@ -635,9 +632,9 @@
.block.block-borderbox {
@include block-variant(#fff, $base-border-color, $text-color-secondary, transparent, $base-border-color);

.widget-inner {
/*.widget-inner {
padding: 10px 15px;
}
}*/
.title_block {
padding: 20px 15px;
}
Expand All @@ -649,9 +646,9 @@

.block.block-primary {
@include block-variant($primary-bg-color, $base-border-color, $primary-heading-text-color, $primary-heading-bg-color, $primary-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand All @@ -661,9 +658,9 @@

.block.block-success {
@include block-variant($success-bg-color, $base-border-color, $success-heading-text-color, $success-heading-bg-color, $success-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand All @@ -673,9 +670,9 @@

.block.block-info {
@include block-variant($info-bg-color, $base-border-color, $info-heading-text-color, $info-heading-bg-color, $info-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand All @@ -685,9 +682,9 @@

.block.block-warning {
@include block-variant($warning-bg-color, $base-border-color, $warning-heading-text-color, $warning-heading-bg-color, $warning-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand All @@ -697,9 +694,9 @@

.block.block-danger {
@include block-variant($danger-bg-color, $base-border-color, $danger-heading-text-color, $danger-heading-bg-color, $danger-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand All @@ -709,9 +706,9 @@

.block.block-highlighted {
@include block-variant($highlighted-bg-color, $base-border-color, $highlighted-heading-text-color, $highlighted-heading-bg-color, $highlighted-heading-border-color);
.widget-inner {
/*.widget-inner {
padding: 15px;
}
}*/
.block_content {
border-style: solid;
border-width: 1px;
Expand Down
Loading

0 comments on commit a853ed4

Please sign in to comment.