diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index cc6232c57..b6cd70e42 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -710,7 +710,6 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-icon i,nav#layo nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li a .nav-label{line-height:30px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:first-child{margin-left:-13px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child{margin-right:0} -nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li.active:first-child{margin-left:0} nav#layout-mainmenu.navbar-mode-tile{height:78px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a{height:78px;line-height:78px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-account > a{height:78px;line-height:78px} diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less index 428ff8e84..fc09a2cf4 100644 --- a/modules/backend/assets/less/layout/mainmenu.less +++ b/modules/backend/assets/less/layout/mainmenu.less @@ -325,9 +325,9 @@ nav#layout-mainmenu.navbar-mode-inline { li.active { .mainmenu-item-link-active(); - &:first-child { - margin-left: 0; - } + // &:first-child { + // margin-left: 0; + // } } } diff --git a/modules/backend/widgets/table/assets/css/table.css b/modules/backend/widgets/table/assets/css/table.css index f1f14fbec..9a85d6120 100644 --- a/modules/backend/widgets/table/assets/css/table.css +++ b/modules/backend/widgets/table/assets/css/table.css @@ -13,7 +13,7 @@ margin-bottom: 0; } .control-table.active .table-container { - border-color: #808c8d; + border-color: #e0e0e0; } .control-table table { width: 100%; @@ -62,7 +62,7 @@ border-right: none; } .control-table.active table.headers:after { - border-bottom-color: #808c8d; + border-bottom-color: #e0e0e0; } .control-table table.data td { border: 1px solid #ecf0f1; @@ -169,7 +169,7 @@ background-position: 0 -113px; } .control-table.active .toolbar { - border-bottom-color: #808c8d; + border-bottom-color: #e0e0e0; } .control-table .pagination ul { padding: 0; @@ -225,7 +225,7 @@ ul.table-widget-autocomplete { background: white; font-size: 13px; margin-top: 0; - border: 1px solid #808c8d; + border: 1px solid #e0e0e0; border-top: 1px solid #ecf0f1; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; @@ -353,7 +353,7 @@ html.cssanimations .control-table td[data-column-type=dropdown] [data-view-conta user-select: none; position: absolute; background: white; - border: 1px solid #808c8d; + border: 1px solid #e0e0e0; border-top: none; padding-top: 1px; overflow: hidden; diff --git a/modules/backend/widgets/table/assets/less/table.less b/modules/backend/widgets/table/assets/less/table.less index d560f43f3..bd3779202 100644 --- a/modules/backend/widgets/table/assets/less/table.less +++ b/modules/backend/widgets/table/assets/less/table.less @@ -4,7 +4,7 @@ * General control styling */ -@table-active-border: #808c8d; +@table-active-border: #e0e0e0; @table-inactive-border: #e0e0e0; .control-table { diff --git a/modules/cms/widgets/templatelist/partials/_body.htm b/modules/cms/widgets/templatelist/partials/_body.htm index 328706b88..a4273cb7b 100644 --- a/modules/cms/widgets/templatelist/partials/_body.htm +++ b/modules/cms/widgets/templatelist/partials/_body.htm @@ -2,7 +2,7 @@
- makePartial('templates', ['data'=>$data]) ?> + makePartial('templates', ['data' => $data]) ?>
diff --git a/modules/cms/widgets/templatelist/partials/_items.htm b/modules/cms/widgets/templatelist/partials/_items.htm index ebdcd27fc..ac6c16e5e 100644 --- a/modules/cms/widgets/templatelist/partials/_items.htm +++ b/modules/cms/widgets/templatelist/partials/_items.htm @@ -12,8 +12,13 @@ itemType.'-'.$this->theme->getDirName().'-'.$item->fileName; ?> -
  • - +
  • + title) ?> descriptions as $title => $value): ?> @@ -27,11 +32,11 @@ - +
    fileName) ?> isItemSelected($item->fileName) ? 'checked' : null ?> diff --git a/modules/system/assets/ui/less/breadcrumb.less b/modules/system/assets/ui/less/breadcrumb.less index f6e88fbfc..bf2f9b632 100644 --- a/modules/system/assets/ui/less/breadcrumb.less +++ b/modules/system/assets/ui/less/breadcrumb.less @@ -30,7 +30,7 @@ font-size: 15px; list-style: none; margin: 0; - padding: 12px 10px 13px 30px; + padding: 12px 10px 12px 30px; display: inline-block; position: relative; color: @color-breadcrumb-text; @@ -52,13 +52,13 @@ } &:after { - .triangle(right, 15px, 46px, @color-breadcrumb-inactive-background); + .triangle(right, 15px, 45px, @color-breadcrumb-inactive-background); } &:before { right: -16px; z-index: 9; - .triangle(right, 15px, 46px, @color-breadcrumb-background); + .triangle(right, 15px, 45px, @color-breadcrumb-background); } &:first-child { diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index c65412061..5496a46b8 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -1374,12 +1374,12 @@ body.popover-open .control-popover .popover-head:before{display:none} } .control-breadcrumb{margin:-20px -20px 20px -20px;background-color:#d0d9dd;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05);box-shadow:inset 0 -2px 0 rgba(0,0,0,0.05)} .control-breadcrumb ul{padding:0;margin:0;font-size:0} -.control-breadcrumb li{font-size:15px;list-style:none;margin:0;padding:12px 10px 13px 30px;display:inline-block;position:relative;color:#ffffff;background-color:#9098a2} +.control-breadcrumb li{font-size:15px;list-style:none;margin:0;padding:12px 10px 12px 30px;display:inline-block;position:relative;color:#ffffff;background-color:#9098a2} .control-breadcrumb li a{display:inline-block;color:#ffffff;text-decoration:none;text-shadow:0 1px 0 rgba(0,0,0,0.2)} .control-breadcrumb li a:hover{color:#ffffff} .control-breadcrumb li:before,.control-breadcrumb li:after{top:0;right:-15px;position:absolute;z-index:10} -.control-breadcrumb li:after{content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #9098a2} -.control-breadcrumb li:before{right:-16px;z-index:9;content:'';display:block;width:0;height:0;border-top:23px solid transparent;border-bottom:23px solid transparent;border-left:15px solid #d0d9dd} +.control-breadcrumb li:after{content:'';display:block;width:0;height:0;border-top:22.5px solid transparent;border-bottom:22.5px solid transparent;border-left:15px solid #9098a2} +.control-breadcrumb li:before{right:-16px;z-index:9;content:'';display:block;width:0;height:0;border-top:22.5px solid transparent;border-bottom:22.5px solid transparent;border-left:15px solid #d0d9dd} .control-breadcrumb li:first-child{padding-left:20px} .control-breadcrumb li:last-child:after{content:''} .control-breadcrumb li:last-child{background-color:transparent;color:#2a3e51;text-shadow:0 1px 0 rgba(255,255,255,0.7)}