Skip to content

Commit 81b4758

Browse files
committed
Merge branch 'develop' of https://github.com/CherryFramework/cherry-framework into develop
2 parents 1c7194e + 8972a82 commit 81b4758

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

modules/cherry-interface-builder/inc/assets/cherry-interface-builder.scss

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ $color-7: #206ff4; // Scrollbar track background
99
$link-color: #298ffc; // link color.
1010
$link-hover-color: #23282d; // link hover color.
1111

12-
$shadow: 0px 5px 21px rgba(0, 0, 0, 0.1); //Shadow.
12+
$shadow: 2px 2px 10px rgba(0, 0, 0, 0.1); //Shadow.
1313
$border: 1px solid rgba(0, 0, 0, 0.1) ;
1414

15-
$br-radius: 5px; // Border radius.
15+
$br-radius: 3px; // Border radius.
1616

17-
$padding: 10px;
18-
$margin: 10px;
17+
$padding: 5px;
18+
$margin: 5px;
1919
$max-heught: 700px;
2020

2121
@import "use-in-js";
@@ -364,7 +364,7 @@ html{
364364
>.cherry-tab__tabs{
365365
flex-direction: row;
366366
-webkit-box-flex: 0;
367-
flex: 0 1 25%;
367+
flex: 0 1 20%;
368368
border-radius:$br-radius 0 0 $br-radius;
369369
border-right: none;
370370
.cherry-component__button{
@@ -379,7 +379,7 @@ html{
379379
}
380380
>.cherry-tab__content{
381381
-webkit-box-flex: 0;
382-
flex: 0 1 75%;
382+
flex: 0 1 80%;
383383
border-radius: 0 $br-radius $br-radius 0;
384384
}
385385
}
@@ -424,7 +424,9 @@ html{
424424
}
425425
}
426426
.cherry-control{
427-
padding: $padding * 1.5 $padding * 2;
427+
padding: $padding * 3 0;
428+
margin: 0 $margin;
429+
428430
&__title{
429431
margin: 0 0 $margin 0 ;
430432
}
@@ -434,8 +436,11 @@ html{
434436
.cherry-ui-container {
435437
margin: 0;
436438
}
439+
437440
@media (min-width: 783px) {
438-
padding: $padding * 1.5;
441+
padding: $padding * 4;
442+
margin: 0 $margin * 1.5;
443+
439444
display: flex;
440445
flex-flow: row nowrap;
441446
&__info{
@@ -448,9 +453,12 @@ html{
448453
flex: 0 1 70%;
449454
}
450455
}
456+
451457
@media ( min-width: 961px ) {
452-
padding: $padding * 3;
458+
padding: $padding * 6 0;
459+
margin: 0 $margin * 3;
453460
}
461+
454462
.widget & {
455463
padding: $padding * 1.5 0;
456464
flex-direction: column;

modules/cherry-interface-builder/inc/assets/min/cherry-interface-builder.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/cherry-ui-elements/inc/ui-elements/ui-select/assets/min/ui-select.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/cherry-ui-elements/inc/ui-elements/ui-select/assets/ui-kit/_mixins.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@mixin input() {
22
font-size: 12px;
33
line-height: 16px;
4-
color: $dark_color;
5-
background-color: $bg_color;
64
border-radius: $border_radius_extra_small;
75
padding: 5px;
86
min-height: 28px;

modules/cherry-ui-elements/inc/ui-elements/ui-select/assets/ui-select.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ label.cherry-label{
1515
select.cherry-ui-select{
1616
width: 100%;
1717
outline: 0 none;
18-
color: $dark_color;
1918
@include input();
19+
2020
&:focus{
21-
border-color: none;
2221
box-shadow: none;
2322
}
2423

0 commit comments

Comments
 (0)