From eb82297f451e1148b217722b73a69d7c44e09f05 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Tue, 22 Oct 2013 10:04:45 +0200 Subject: [PATCH] // small fixs --- admin-dev/themes/default/css/admin-theme.css | 75 +- .../css/admin-theme/_admin-commons.sass | 20 + .../default/css/admin-theme/_admin-forms.sass | 13 +- .../css/admin-theme/_bootstrap-mixins.scss | 728 ++++++++++++++++++ .../template/controllers/images/content.tpl | 14 +- admin-dev/themes/default/template/header.tpl | 2 +- controllers/admin/AdminImagesController.php | 2 +- 7 files changed, 824 insertions(+), 30 deletions(-) create mode 100644 admin-dev/themes/default/css/admin-theme/_bootstrap-mixins.scss diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index e715630b1..12b87dca6 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -8263,11 +8263,31 @@ a.link-social:hover { -webkit-font-smoothing: antialiased; content: "\f00c"; } -/* line 81, admin-theme/_admin-commons.sass */ +/* line 80, admin-theme/_admin-commons.sass */ +.alert.alert-info, #carrier_wizard .alert-info.wizard_error { + padding-left: 60px; + position: relative; } +/* line 83, admin-theme/_admin-commons.sass */ +.alert.alert-info:before, #carrier_wizard .alert-info.wizard_error:before { + position: absolute; + top: 0; + left: 10px; + display: block; + min-height: 25px; + min-width: 25px; + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + font-size: 35px; + text-decoration: inherit; + -webkit-font-smoothing: antialiased; + content: "\F05A"; } + +/* line 101, admin-theme/_admin-commons.sass */ .panel .panel-footer, #header_notifs_icon_wrapper .notifs_panel .panel-footer, #dash_version .panel-footer, #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer { margin: 0 -20px -20px; } -/* line 84, admin-theme/_admin-commons.sass */ +/* line 104, admin-theme/_admin-commons.sass */ .overflow-y { height: 200px; overflow-y: auto; } @@ -8452,24 +8472,37 @@ textarea { resize: none; } /* line 36, admin-theme/_admin-forms.sass */ +textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus { + background-color: #fefbe2; + -webkit-box-shadow: none; + box-shadow: none; } + +/* line 41, admin-theme/_admin-forms.sass */ .btn { text-transform: uppercase; } -/* line 38, admin-theme/_admin-forms.sass */ +/* line 43, admin-theme/_admin-forms.sass */ .btn .caret { border-top-color: #333333 !important; } -/* line 41, admin-theme/_admin-forms.sass */ +/* line 46, admin-theme/_admin-forms.sass */ .btn:hover .caret, .btn:focus .caret { border-top-color: white !important; } -/* line 43, admin-theme/_admin-forms.sass */ +/* line 48, admin-theme/_admin-forms.sass */ .btn.btn-default { -webkit-box-shadow: #e6e6e6 0 -2px 0 inset; box-shadow: #e6e6e6 0 -2px 0 inset; } -/* line 46, admin-theme/_admin-forms.sass */ +/* line 50, admin-theme/_admin-forms.sass */ +.btn.btn-default:hover { + -webkit-box-shadow: none; + box-shadow: none; + background-color: #1ba6e5; + color: white; + border-color: #1585b8; } +/* line 57, admin-theme/_admin-forms.sass */ .btn.btn-primary { background-color: #1ba6e5; color: white; border-color: #1585b8; } -/* line 52, admin-theme/_admin-forms.sass */ +/* line 63, admin-theme/_admin-forms.sass */ .btn.btn-default[disabled] { border-color: #999999; color: #999999; @@ -8477,46 +8510,46 @@ textarea { -webkit-box-shadow: #cccccc 0 -2px 0 inset; box-shadow: #cccccc 0 -2px 0 inset; } -/* line 57, admin-theme/_admin-forms.sass */ +/* line 68, admin-theme/_admin-forms.sass */ .dropdown-menu { text-align: left; } -/* line 59, admin-theme/_admin-forms.sass */ +/* line 70, admin-theme/_admin-forms.sass */ .btn-group-action { float: right; } -/* line 61, admin-theme/_admin-forms.sass */ +/* line 72, admin-theme/_admin-forms.sass */ .btn-group-action a { text-decoration: none; } -/* line 65, admin-theme/_admin-forms.sass */ +/* line 76, admin-theme/_admin-forms.sass */ .tt-query { border-bottom-right-radius: 3px !important; border-top-right-radius: 3px !important; } -/* line 67, admin-theme/_admin-forms.sass */ +/* line 78, admin-theme/_admin-forms.sass */ .tt-dropdown-menu { background-color: white; border: solid 1px #cccccc; font-size: 0.9em; text-transform: none; } -/* line 72, admin-theme/_admin-forms.sass */ +/* line 83, admin-theme/_admin-forms.sass */ .tt-suggestions { padding: 0 6px; -webkit-box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; box-shadow: rgba(0, 0, 0, 0.25) 0 1px 4px; } -/* line 75, admin-theme/_admin-forms.sass */ +/* line 86, admin-theme/_admin-forms.sass */ .tt-suggestion p { border-bottom: solid 1px #cccccc; margin: 0 !important; padding: 0 !important; } -/* line 79, admin-theme/_admin-forms.sass */ +/* line 90, admin-theme/_admin-forms.sass */ .tt-suggestion:last-child p { border-bottom: none; } -/* line 83, admin-theme/_admin-forms.sass */ +/* line 94, admin-theme/_admin-forms.sass */ .tagify-container { background-color: white; padding: 2px 6px; @@ -8530,10 +8563,10 @@ textarea { border: solid 1px #cccccc; -webkit-box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; box-shadow: rgba(0, 0, 0, 0.075) 0 1px 1px inset; } -/* line 91, admin-theme/_admin-forms.sass */ +/* line 102, admin-theme/_admin-forms.sass */ .tagify-container span { float: left; } -/* line 93, admin-theme/_admin-forms.sass */ +/* line 104, admin-theme/_admin-forms.sass */ .tagify-container > span { display: inline-block; padding: 3px 5px; @@ -8542,20 +8575,20 @@ textarea { border: 1px solid #1ba6e5; background-color: #60c1ed; color: white; } -/* line 101, admin-theme/_admin-forms.sass */ +/* line 112, admin-theme/_admin-forms.sass */ .tagify-container > span > a { padding-left: 5px; color: #1ba6e5; text-decoration: none; font-weight: bold; } -/* line 106, admin-theme/_admin-forms.sass */ +/* line 117, admin-theme/_admin-forms.sass */ .tagify-container > input { margin-top: 2px; border: 0 none; width: 100px; -webkit-box-shadow: none; box-shadow: none; } -/* line 111, admin-theme/_admin-forms.sass */ +/* line 122, admin-theme/_admin-forms.sass */ .tagify-container > input:focus { outline: 0; -webkit-box-shadow: none; diff --git a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass index ef8e594e6..a6b300da4 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-commons.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-commons.sass @@ -77,6 +77,26 @@ -webkit-font-smoothing: antialiased content: "\f00c" +.alert.alert-info + padding-left: 60px + position: relative + &:before + position: absolute + top: 0 + left: 10px + display: block + min-height: 25px + min-width: 25px + font-family: FontAwesome + font-weight: normal + font-style: normal + font-size: 35px + text-decoration: inherit + -webkit-font-smoothing: antialiased + content: "\F05A" + + + .panel .panel-footer margin: 0 -20px -20px diff --git a/admin-dev/themes/default/css/admin-theme/_admin-forms.sass b/admin-dev/themes/default/css/admin-theme/_admin-forms.sass index 684ed84ad..7d088e7f4 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-forms.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-forms.sass @@ -32,6 +32,11 @@ input[type="password"].input-tiny textarea resize: none + +textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .uneditable-input:focus + background-color: #FEFBE2 + @include box-shadow(none) + //buttons .btn text-transform: uppercase @@ -42,6 +47,12 @@ textarea border-top-color: white!important &.btn-default @include box-shadow(darken($btn-default-bg,10%) 0 -2px 0 inset) + &:hover + @include box-shadow(none) + background-color: $brand-primary + color: white + border-color: darken($brand-primary,10%) + &.btn-primary background-color: $brand-primary @@ -53,7 +64,7 @@ textarea border-color: $gray-light color: $gray-light background-color: lighten($gray-light,35%) - @include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset) + @include box-shadow(lighten($gray-light,20%) 0 -2px 0 inset) .dropdown-menu text-align: left .btn-group-action diff --git a/admin-dev/themes/default/css/admin-theme/_bootstrap-mixins.scss b/admin-dev/themes/default/css/admin-theme/_bootstrap-mixins.scss new file mode 100644 index 000000000..d0368ab97 --- /dev/null +++ b/admin-dev/themes/default/css/admin-theme/_bootstrap-mixins.scss @@ -0,0 +1,728 @@ +// +// Mixins +// -------------------------------------------------- + + +// Utilities +// ------------------------- + +// Clearfix +// Source: http://nicolasgallagher.com/micro-clearfix-hack/ +// +// For modern browsers +// 1. The space content is one way to avoid an Opera bug when the +// contenteditable attribute is included anywhere else in the document. +// Otherwise it causes space to appear at the top and bottom of elements +// that are clearfixed. +// 2. The use of `table` rather than `block` is only necessary if using +// `:before` to contain the top-margins of child elements. +@mixin clearfix() { + &:before, + &:after { + content: " "; /* 1 */ + display: table; /* 2 */ + } + &:after { + clear: both; + } +} + +// Webkit-style focus +@mixin tab-focus() { + // Default + outline: thin dotted #333; + // Webkit + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +// Center-align a block level element +@mixin center-block() { + display: block; + margin-left: auto; + margin-right: auto; +} + +// Sizing shortcuts +@mixin size($width, $height) { + width: $width; + height: $height; +} +@mixin square($size) { + @include size($size, $size); +} + +// Placeholder text +@mixin placeholder($color: $input-color-placeholder) { + &:-moz-placeholder { color: $color; } // Firefox 4-18 + &::-moz-placeholder { color: $color; } // Firefox 19+ + &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+ + &::-webkit-input-placeholder { color: $color; } // Safari and Chrome +} + +// Text overflow +// Requires inline-block or block for proper styling +@mixin text-overflow() { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +// CSS image replacement +// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 +@mixin hide-text() { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + + + +// CSS3 PROPERTIES +// -------------------------------------------------- + +// Single side border-radius +@mixin border-top-radius($radius) { + border-top-right-radius: $radius; + border-top-left-radius: $radius; +} +@mixin border-right-radius($radius) { + border-bottom-right-radius: $radius; + border-top-right-radius: $radius; +} +@mixin border-bottom-radius($radius) { + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; +} +@mixin border-left-radius($radius) { + border-bottom-left-radius: $radius; + border-top-left-radius: $radius; +} + +// Drop shadows +@mixin box-shadow($shadow...) { + -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1 + box-shadow: $shadow; +} + +// Transitions +@mixin transition($transition...) { + -webkit-transition: $transition; + transition: $transition; +} +@mixin transition-delay($transition-delay) { + -webkit-transition-delay: $transition-delay; + transition-delay: $transition-delay; +} +@mixin transition-duration($transition-duration) { + -webkit-transition-duration: $transition-duration; + transition-duration: $transition-duration; +} +@mixin transition-transform($transition...) { + -webkit-transition: -webkit-transform $transition; + -moz-transition: -moz-transform $transition; + -o-transition: -o-transform $transition; + transition: transform $transition; +} + +// Transformations +@mixin rotate($degrees) { + -webkit-transform: rotate($degrees); + -ms-transform: rotate($degrees); // IE9+ + transform: rotate($degrees); +} +@mixin scale($ratio) { + -webkit-transform: scale($ratio); + -ms-transform: scale($ratio); // IE9+ + transform: scale($ratio); +} +@mixin translate($x, $y) { + -webkit-transform: translate($x, $y); + -ms-transform: translate($x, $y); // IE9+ + transform: translate($x, $y); +} +@mixin skew($x, $y) { + -webkit-transform: skew($x, $y); + -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ + transform: skew($x, $y); +} +@mixin translate3d($x, $y, $z) { + -webkit-transform: translate3d($x, $y, $z); + transform: translate3d($x, $y, $z); +} + +// Backface visibility +// Prevent browsers from flickering when using CSS 3D transforms. +// Default value is `visible`, but can be changed to `hidden` +// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples +@mixin backface-visibility($visibility){ + -webkit-backface-visibility: $visibility; + -moz-backface-visibility: $visibility; + backface-visibility: $visibility; +} + +// Box sizing +@mixin box-sizing($boxmodel) { + -webkit-box-sizing: $boxmodel; + -moz-box-sizing: $boxmodel; + box-sizing: $boxmodel; +} + +// User select +// For selecting text on the page +@mixin user-select($select) { + -webkit-user-select: $select; + -moz-user-select: $select; + -ms-user-select: $select; // IE10+ + -o-user-select: $select; + user-select: $select; +} + +// Resize anything +@mixin resizable($direction) { + resize: $direction; // Options: horizontal, vertical, both + overflow: auto; // Safari fix +} + +// CSS3 Content Columns +@mixin content-columns($column-count, $column-gap: $grid-gutter-width) { + -webkit-column-count: $column-count; + -moz-column-count: $column-count; + column-count: $column-count; + -webkit-column-gap: $column-gap; + -moz-column-gap: $column-gap; + column-gap: $column-gap; +} + +// Optional hyphenation +@mixin hyphens($mode: auto) { + word-wrap: break-word; + -webkit-hyphens: $mode; + -moz-hyphens: $mode; + -ms-hyphens: $mode; // IE10+ + -o-hyphens: $mode; + hyphens: $mode; +} + +// Opacity +@mixin opacity($opacity) { + opacity: $opacity; + // IE8 filter + $opacity-ie: ($opacity * 100); + filter: alpha(opacity=$opacity-ie); +} + + + +// GRADIENTS +// -------------------------------------------------- + + + +// Horizontal gradient, from left to right +// +// Creates two color stops, start and end, by specifying a color and position for each color stop. +// Color stops are not available in IE9 and below. +@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { + background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ + background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down +} + +// Vertical gradient, from top to bottom +// +// Creates two color stops, start and end, by specifying a color and position for each color stop. +// Color stops are not available in IE9 and below. +@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { + background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+ + background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10 + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down +} + +@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { + background-repeat: repeat-x; + background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+ + background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+ + background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10 +} +@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); + background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); + background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); + background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback +} +@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { + background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color)); + background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); + background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color); + background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback +} +@mixin gradient-radial($inner-color: #555, $outer-color: #333) { + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color)); + background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); + background-image: -moz-radial-gradient(circle, $inner-color, $outer-color); + background-image: radial-gradient(circle, $inner-color, $outer-color); + background-repeat: no-repeat; +} +@mixin gradient-striped($color: #555, $angle: 45deg) { + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); +} + +// Reset filters for IE +// +// When you need to remove a gradient background, do not forget to use this to reset +// the IE filter for IE9 and below. +@mixin reset-filter() { + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} + + + +// Retina images +// +// Short retina mixin for setting background-image and -size + +@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) { + background-image: url("#{$file-1x}"); + + @media + only screen and (-webkit-min-device-pixel-ratio: 2), + only screen and ( min--moz-device-pixel-ratio: 2), + only screen and ( -o-min-device-pixel-ratio: 2/1), + only screen and ( min-device-pixel-ratio: 2), + only screen and ( min-resolution: 192dpi), + only screen and ( min-resolution: 2dppx) { + background-image: url("#{$file-2x}"); + background-size: $width-1x $height-1x; + } +} + + +// Responsive image +// +// Keep images from scaling beyond the width of their parents. + +@mixin img-responsive($display: block) { + display: $display; + max-width: 100%; // Part 1: Set a maximum relative to the parent + height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching +} + + +// COMPONENT MIXINS +// -------------------------------------------------- + +// Horizontal dividers +// ------------------------- +// Dividers (basically an hr) within dropdowns and nav lists +@mixin nav-divider($color: #e5e5e5) { + height: 1px; + margin: (($line-height-computed / 2) - 1) 0; + overflow: hidden; + background-color: $color; +} + +// Panels +// ------------------------- +@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) { + border-color: $border; + & > .panel-heading { + color: $heading-text-color; + background-color: $heading-bg-color; + border-color: $heading-border; + + .panel-collapse .panel-body { + border-top-color: $border; + } + } + & > .panel-footer { + + .panel-collapse .panel-body { + border-bottom-color: $border; + } + } +} + +// Alerts +// ------------------------- +@mixin alert-variant($background, $border, $text-color) { + background-color: $background; + border-color: $border; + color: $text-color; + hr { + border-top-color: darken($border, 5%); + } + .alert-link { + color: darken($text-color, 10%); + } +} + +// Tables +// ------------------------- +@mixin table-row-variant($state, $background, $border) { + // Exact selectors below required to override `.table-striped` and prevent + // inheritance to nested tables. + .table > thead > tr, + .table > tbody > tr, + .table > tfoot > tr { + > td.#{$state}, + > th.#{$state}, + &.#{$state} > td, + &.#{$state} > th { + background-color: $background; + border-color: $border; + } + } + + // Hover states for `.table-hover` + // Note: this is not available for cells or rows within `thead` or `tfoot`. + .table-hover > tbody > tr { + > td.#{$state}:hover, + > th.#{$state}:hover, + &.#{$state}:hover > td { + background-color: darken($background, 5%); + border-color: darken($border, 5%); + } + } +} + +// Button variants +// ------------------------- +// Easily pump out default styles, as well as :hover, :focus, :active, +// and disabled options for all buttons +@mixin button-variant($color, $background, $border) { + color: $color; + background-color: $background; + border-color: $border; + + &:hover, + &:focus, + &:active, + &.active { + color: $color; + background-color: darken($background, 8%); + border-color: darken($border, 12%); + } + .open & { &.dropdown-toggle { + color: $color; + background-color: darken($background, 8%); + border-color: darken($border, 12%); + } } + &:active, + &.active { + background-image: none; + } + .open & { &.dropdown-toggle { + background-image: none; + } } + &.disabled, + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &:active, + &.active { + background-color: $background; + border-color: $border + } + } +} + +// Button sizes +// ------------------------- +@mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { + padding: $padding-vertical $padding-horizontal; + font-size: $font-size; + line-height: $line-height; + border-radius: $border-radius; +} + +// Pagination +// ------------------------- +@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) { + > li { + > a, + > span { + padding: $padding-vertical $padding-horizontal; + font-size: $font-size; + } + &:first-child { + > a, + > span { + @include border-left-radius($border-radius); + } + } + &:last-child { + > a, + > span { + @include border-right-radius($border-radius); + } + } + } +} + +// Labels +// ------------------------- +@mixin label-variant($color) { + background-color: $color; + &[href] { + &:hover, + &:focus { + background-color: darken($color, 10%); + } + } +} + +// Navbar vertical align +// ------------------------- +// Vertically center elements in the navbar. +// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin. +@mixin navbar-vertical-align($element-height) { + margin-top: (($navbar-height - $element-height) / 2); + margin-bottom: (($navbar-height - $element-height) / 2); +} + +// Progress bars +// ------------------------- +@mixin progress-bar-variant($color) { + background-color: $color; + .progress-striped & { + @include gradient-striped($color); + } +} + +// Responsive utilities +// ------------------------- +// More easily include all the states for responsive-utilities.less. +// $parent hack because sass doesn't support tr& (without space) +@mixin responsive-visibility($parent) { + #{$parent} { display: block !important; } + tr#{$parent} { display: table-row !important; } + th#{$parent}, + td#{$parent} { display: table-cell !important; } +} + +@mixin responsive-invisibility($parent) { + #{$parent} { display: none !important; } + tr#{$parent} { display: none !important; } + th#{$parent}, + td#{$parent} { display: none !important; } +} + +// Grid System +// ----------- + +// Centered container element +@mixin container-fixed() { + margin-right: auto; + margin-left: auto; + padding-left: ($grid-gutter-width / 2); + padding-right: ($grid-gutter-width / 2); + @include clearfix(); +} + +// Creates a wrapper for a series of columns +@mixin make-row($gutter: $grid-gutter-width) { + margin-left: ($gutter / -2); + margin-right: ($gutter / -2); + @include clearfix(); +} + +// Generate the extra small columns +@mixin make-xs-column($columns, $gutter: $grid-gutter-width) { + position: relative; + float: left; + width: percentage(($columns / $grid-columns)); + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: ($gutter / 2); + padding-right: ($gutter / 2); +} + +// Generate the small columns +@mixin make-sm-column($columns, $gutter: $grid-gutter-width) { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: ($gutter / 2); + padding-right: ($gutter / 2); + + // Calculate width based on number of columns available + @media (min-width: $screen-sm) { + float: left; + width: percentage(($columns / $grid-columns)); + } +} + +// Generate the small column offsets +@mixin make-sm-column-offset($columns) { + @media (min-width: $screen-sm) { + margin-left: percentage(($columns / $grid-columns)); + } +} +@mixin make-sm-column-push($columns) { + @media (min-width: $screen-sm) { + left: percentage(($columns / $grid-columns)); + } +} +@mixin make-sm-column-pull($columns) { + @media (min-width: $screen-sm) { + right: percentage(($columns / $grid-columns)); + } +} + +// Generate the medium columns +@mixin make-md-column($columns, $gutter: $grid-gutter-width) { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: ($gutter / 2); + padding-right: ($gutter / 2); + + // Calculate width based on number of columns available + @media (min-width: $screen-md) { + float: left; + width: percentage(($columns / $grid-columns)); + } +} + +// Generate the large column offsets +@mixin make-md-column-offset($columns) { + @media (min-width: $screen-md) { + margin-left: percentage(($columns / $grid-columns)); + } +} +@mixin make-md-column-push($columns) { + @media (min-width: $screen-md) { + left: percentage(($columns / $grid-columns)); + } +} +@mixin make-md-column-pull($columns) { + @media (min-width: $screen-md) { + right: percentage(($columns / $grid-columns)); + } +} + +// Generate the large columns +@mixin make-lg-column($columns, $gutter: $grid-gutter-width) { + position: relative; + // Prevent columns from collapsing when empty + min-height: 1px; + // Inner gutter via padding + padding-left: ($gutter / 2); + padding-right: ($gutter / 2); + + // Calculate width based on number of columns available + @media (min-width: $screen-lg) { + float: left; + width: percentage(($columns / $grid-columns)); + } +} + +// Generate the large column offsets +@mixin make-lg-column-offset($columns) { + @media (min-width: $screen-lg) { + margin-left: percentage(($columns / $grid-columns)); + } +} +@mixin make-lg-column-push($columns) { + @media (min-width: $screen-lg) { + left: percentage(($columns / $grid-columns)); + } +} +@mixin make-lg-column-pull($columns) { + @media (min-width: $screen-lg) { + right: percentage(($columns / $grid-columns)); + } +} + + +// Form validation states +// +// Used in forms.less to generate the form validation CSS for warnings, errors, +// and successes. + +@mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) { + // Color the label and help text + .help-block, + .control-label { + color: $text-color; + } + // Set the border and box shadow on specific inputs to match + .form-control { + border-color: $border-color; + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + &:focus { + border-color: darken($border-color, 10%); + $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%); + @include box-shadow($shadow); + } + } + // Set validation states also for addons + .input-group-addon { + color: $text-color; + border-color: $border-color; + background-color: $background-color; + } +} + +// Form control focus state +// +// Generate a customized focus state and for any input with the specified color, +// which defaults to the `$input-focus-border` variable. +// +// We highly encourage you to not customize the default value, but instead use +// this to tweak colors on an as-needed basis. This aesthetic change is based on +// WebKit's default styles, but applicable to a wider range of browsers. Its +// usability and accessibility should be taken into account with any change. +// +// Example usage: change the default blue border and shadow to white for better +// contrast against a dark gray background. + +@mixin form-control-focus($color: $input-border-focus) { + $color-rgba: rgba(red($color), green($color), blue($color), .6); + &:focus { + border-color: $color; + outline: 0; + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba); + } +} + +// Form control sizing +// +// Relative text size, padding, and border-radii changes for form controls. For +// horizontal sizing, wrap controls in the predefined grid classes. ` @@ -76,7 +76,7 @@ -
+
{foreach $types AS $k => $type}
-
+
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 5e1e9f2f5..8dfffdd0a 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -219,7 +219,7 @@
- diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 10a90b421..b84e1cc1e 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -392,7 +392,7 @@ class AdminImagesControllerCore extends AdminController public static function printEntityActiveIcon($value, $object) { - return ($value ? '' : ''); + return ($value ? '' : ''); } protected function _childValidation()