diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 238b77d4e..fc228c49a 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -818,7 +818,7 @@ color: #666666; font-size: 12px; text-align: center; - font-weight: 400; + font-weight: normal; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -828,7 +828,7 @@ margin: 0; } .control-filelist ul li { - font-weight: 300; + font-weight: normal; line-height: 150%; position: relative; list-style: none; @@ -852,7 +852,7 @@ } .control-filelist ul li a { display: block; - padding: 10px 40px 10px 20px; + padding: 10px 45px 10px 20px; outline: none; } .control-filelist ul li a:hover, @@ -864,26 +864,29 @@ display: block; } .control-filelist ul li a span.title { - font-weight: 500; + font-weight: normal; color: #405261; - font-size: 12px; + font-size: 14px; } .control-filelist ul li a span.description { color: #8f8f8f; - font-size: 12px; - font-weight: 500; + font-size: 13px; + white-space: nowrap; + font-weight: normal; + overflow: hidden; + text-overflow: ellipsis; } .control-filelist ul li a span.description strong { color: #405261; - font-weight: 500; + font-weight: normal; } .control-filelist ul li.group > h4, .control-filelist ul li.group > div.group > h4 { - font-weight: 500; - font-size: 12px; + font-weight: normal; + font-size: 14px; margin-top: 0; margin-bottom: 0; - display: relative; + position: relative; } .control-filelist ul li.group > h4 a, .control-filelist ul li.group > div.group > h4 a { @@ -908,7 +911,8 @@ } .control-filelist ul li.group > h4 a:after, .control-filelist ul li.group > div.group > h4 a:after { - left: 34px; + left: 33px; + top: 9px; font-family: FontAwesome; font-weight: normal; font-style: normal; @@ -917,8 +921,7 @@ *margin-right: .3em; content: "\f07b"; color: #a1aab1; - font-size: 14px; - top: 9px; + font-size: 16px; } .control-filelist ul li.group > h4 a:before, .control-filelist ul li.group > div.group > h4 a:before { @@ -1043,8 +1046,8 @@ } .control-filelist ul li .checkbox { position: absolute; - top: 13px; - right: 17px; + top: -3px; + right: 3px; } .control-filelist ul li .checkbox label { margin-right: 0; @@ -1067,8 +1070,8 @@ border-bottom: 1px solid #ecf0f1; } .control-filelist.hero ul li > a span.title { - font-size: 13px; - font-weight: 600; + font-size: 15px; + font-weight: normal; color: #2b3e50; } .control-filelist.hero ul li > a .list-icon { @@ -1179,7 +1182,7 @@ color: #2b3e50; font-size: 15px; margin: 0; - font-weight: 600; + font-weight: bold; padding: 0; } .control-filelist.hero ul > li.group > ul > li > a { @@ -2864,6 +2867,9 @@ body { .layout > .layout-row > .layout-cell.width-300 { width: 300px; } +.layout > .layout-row > .layout-cell.width-350 { + width: 350px; +} .layout > .layout-row > .layout-cell.layout-container, .layout > .layout-row > .layout-cell .layout-container, .layout > .layout-row > .layout-cell.padded-container, @@ -2912,6 +2918,9 @@ body { .layout > .layout-row > .layout-cell.width-300 { width: 300px; } +.layout > .layout-row > .layout-cell.width-350 { + width: 350px; +} .layout > .layout-row > .layout-cell.layout-container, .layout > .layout-row > .layout-cell .layout-container, .layout > .layout-row > .layout-cell.padded-container, @@ -2968,6 +2977,9 @@ body { .layout > .layout-cell.width-300 { width: 300px; } +.layout > .layout-cell.width-350 { + width: 350px; +} .layout > .layout-cell.layout-container, .layout > .layout-cell .layout-container, .layout > .layout-cell.padded-container, @@ -3707,7 +3719,7 @@ body.display-side-panel #layout-side-panel { display: block; position: absolute; z-index: 500; - width: 300px; + width: 350px; -webkit-box-shadow: 2px 0px 2px 0 rgba(0, 0, 0, 0.3); box-shadow: 2px 0px 2px 0 rgba(0, 0, 0, 0.3); } @@ -4472,6 +4484,7 @@ html.csstransitions body.outer.preload .outer-form-container { display: none; } .fancy-layout .form-tabless-fields.collapsed .form-buttons { + margin-left: 10px; padding-bottom: 0; } .fancy-layout .form-tabless-fields .loading-indicator-container .loading-indicator { @@ -4490,16 +4503,17 @@ html.csstransitions body.outer.preload .outer-form-container { .fancy-layout .form-buttons { -webkit-transition: all 0.5s; transition: all 0.5s; - padding-top: 2px; + padding-top: 11px; padding-bottom: 5px; +} +.fancy-layout .form-buttons .btn { + padding: 0; + margin-right: 5px; margin-top: -6px; -} -.fancy-layout .form-buttons .btn { - margin-left: -11px; + margin-right: 30px; background-color: transparent; -} -.fancy-layout .form-buttons .btn { color: #ffffff; + font-weight: normal; opacity: 0.5; filter: alpha(opacity=50); -webkit-transition: all 0.3s ease; @@ -4509,6 +4523,9 @@ html.csstransitions body.outer.preload .outer-form-container { opacity: 1; filter: alpha(opacity=100); } +.fancy-layout .form-buttons .btn:last-child { + margin-right: 0; +} .fancy-layout form.oc-data-changed .btn.save { opacity: 1; filter: alpha(opacity=100); diff --git a/modules/backend/assets/less/controls/filelist.less b/modules/backend/assets/less/controls/filelist.less index 824748caa..f19527210 100644 --- a/modules/backend/assets/less/controls/filelist.less +++ b/modules/backend/assets/less/controls/filelist.less @@ -23,7 +23,7 @@ color: @color-filelist-norecords-text; font-size: 12px; text-align: center; - font-weight: 400; + font-weight: normal; .border-radius(@border-radius-base); } @@ -32,7 +32,7 @@ margin: 0; li { - font-weight: 300; + font-weight: normal; line-height: 150%; position: relative; list-style: none; @@ -58,7 +58,7 @@ a { display: block; - padding: 10px 40px 10px 20px; + padding: 10px 45px 10px 20px; outline: none; &:hover, &:focus, &:active {text-decoration: none;} @@ -67,19 +67,22 @@ display: block; &.title { - font-weight: 500; + font-weight: normal; color: @color-text-title; - font-size: 12px; + font-size: 14px; } &.description { color: @color-text-description; - font-size: 12px; - font-weight: 500; + font-size: 13px; + white-space: nowrap; + font-weight: normal; + overflow: hidden; + text-overflow: ellipsis; strong { color: @color-text-title; - font-weight: 500; + font-weight: normal; } } } @@ -87,11 +90,11 @@ &.group { > h4, > div.group > h4 { - font-weight: 500; - font-size: 12px; + font-weight: normal; + font-size: 14px; margin-top: 0; margin-bottom: 0; - display: relative; + position: relative; a { padding: 10px 20px 10px 53px; @@ -110,11 +113,11 @@ } &:after { - left: 34px; + left: 33px; + top: 9px; .icon(@folder); color: @color-list-icon; - font-size: 14px; - top: 9px; + font-size: 16px; } &:before { @@ -205,8 +208,8 @@ .checkbox { position: absolute; - top: 13px; - right: 17px; + top: -3px; + right: 3px; label { margin-right: 0; @@ -253,8 +256,8 @@ border-bottom: 1px solid @color-panel-light; span.title { - font-size: 13px; - font-weight: 600; + font-size: 15px; + font-weight: normal; color: @color-filelist-title-hero; } @@ -362,7 +365,7 @@ color: #2b3e50; font-size: 15px; margin: 0; - font-weight: 600; + font-weight: bold; padding: 0; } } diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less index 98a49abe2..209bf16fa 100644 --- a/modules/backend/assets/less/layout/fancylayout.less +++ b/modules/backend/assets/less/layout/fancylayout.less @@ -482,6 +482,7 @@ } .form-buttons { + margin-left: 10px; padding-bottom: 0; } } @@ -505,25 +506,28 @@ .form-buttons { .transition(all 0.5s); - padding-top: 2px; + padding-top: 11px; padding-bottom: 5px; - margin-top: -6px; .btn { - margin-left: -11px; + padding: 0; + margin-right: 5px; + margin-top: -6px; + margin-right: 30px; background-color: transparent; - } - } - - .form-buttons { - .btn { color: @color-fancy-master-tabs-active-text; + font-weight: normal; + .opacity(0.5); .transition(all 0.3s ease); &:hover { .opacity(1); } + + &:last-child { + margin-right: 0; + } } } diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less index 365ed27cb..e214193ca 100644 --- a/modules/backend/assets/less/layout/layout.less +++ b/modules/backend/assets/less/layout/layout.less @@ -77,6 +77,7 @@ body { &.width-140 { width: 140px; } &.width-200 { width: 200px; } &.width-300 { width: 300px; } + &.width-350 { width: 350px; } &.layout-container, .layout-container, &.padded-container, .padded-container { padding: @padding-standard @padding-standard 0 @padding-standard; diff --git a/modules/backend/assets/less/layout/sidepanel.less b/modules/backend/assets/less/layout/sidepanel.less index f0fe8a8d4..b95be99c1 100644 --- a/modules/backend/assets/less/layout/sidepanel.less +++ b/modules/backend/assets/less/layout/sidepanel.less @@ -65,7 +65,7 @@ body.display-side-panel { display: block; position: absolute; z-index: 500; - width: 300px; + width: 350px; .box-shadow(2px 0px 2px 0 rgba(0, 0, 0, 0.3)); } } diff --git a/modules/backend/controllers/index/index.htm b/modules/backend/controllers/index/index.htm index 59fc4d19f..41d1b0433 100644 --- a/modules/backend/controllers/index/index.htm +++ b/modules/backend/controllers/index/index.htm @@ -1,13 +1,12 @@ = $this->makePartial('warnings') ?> -= Form::open() ?> -