From 8391656af97ce6aff7bd3f14d044f746e0031e1d Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 12 Jun 2015 15:40:40 +0200 Subject: [PATCH] Quality profile styling --- .../core/plugins/category/static/category.js | 2 +- couchpotato/core/plugins/profile/static/profile.js | 50 ++-- .../core/plugins/profile/static/profile.scss | 257 +++++++++------------ couchpotato/core/plugins/quality/static/quality.js | 5 +- .../core/plugins/quality/static/quality.scss | 33 ++- couchpotato/static/fonts/config.json | 6 + couchpotato/static/fonts/icons.eot | Bin 10064 -> 10196 bytes couchpotato/static/fonts/icons.svg | 1 + couchpotato/static/fonts/icons.ttf | Bin 9908 -> 10040 bytes couchpotato/static/fonts/icons.woff | Bin 6012 -> 6088 bytes couchpotato/static/style/_fonts.scss | 11 +- couchpotato/static/style/combined.min.css | 62 +++-- 12 files changed, 181 insertions(+), 246 deletions(-) diff --git a/couchpotato/core/plugins/category/static/category.js b/couchpotato/core/plugins/category/static/category.js index 7fbf851..5962609 100644 --- a/couchpotato/core/plugins/category/static/category.js +++ b/couchpotato/core/plugins/category/static/category.js @@ -125,7 +125,7 @@ var CategoryListBase = new Class({ new Element('span.category_label', { 'text': category.data.label }), - new Element('span.handle') + new Element('span.handle.icon-handle') ).inject(category_list); }); diff --git a/couchpotato/core/plugins/profile/static/profile.js b/couchpotato/core/plugins/profile/static/profile.js index 93bee80..626c8ce 100644 --- a/couchpotato/core/plugins/profile/static/profile.js +++ b/couchpotato/core/plugins/profile/static/profile.js @@ -270,47 +270,42 @@ Profile.Type = new Class({ var data = self.data; self.el = new Element('li.type').adopt( - new Element('span.quality_type').grab( + new Element('span.quality_type.select_wrapper.icon-dropdown').grab( self.fillQualities() ), self.finish_container = new Element('label.finish').adopt( - new Element('span.finish').grab( - self.finish = new Element('input.finish[type=checkbox]', { - 'checked': data.finish !== undefined ? data.finish : 1, - 'events': { - 'change': function(){ - if(self.el == self.el.getParent().getElement(':first-child')){ - self.finish_class.check(); - alert('Top quality always finishes the search'); - return; - } - - self.fireEvent('change'); + self.finish = new Element('input.finish[type=checkbox]', { + 'checked': data.finish !== undefined ? data.finish : 1, + 'events': { + 'change': function(){ + if(self.el == self.el.getParent().getElement(':first-child')){ + alert('Top quality always finishes the search'); + return; } + + self.fireEvent('change'); } - }) - ), + } + }), new Element('span.check_label[text=finish]') ), self['3d_container'] = new Element('label.threed').adopt( - new Element('span.3d').grab( - self['3d'] = new Element('input.3d[type=checkbox]', { - 'checked': data['3d'] !== undefined ? data['3d'] : 0, - 'events': { - 'change': function(){ - self.fireEvent('change'); - } + self['3d'] = new Element('input.3d[type=checkbox]', { + 'checked': data['3d'] !== undefined ? data['3d'] : 0, + 'events': { + 'change': function(){ + self.fireEvent('change'); } - }) - ), + } + }), new Element('span.check_label[text=3D]') ), - new Element('span.delete.icon2', { + new Element('span.delete.icon-cancel', { 'events': { 'click': self.del.bind(self) } }), - new Element('span.handle') + new Element('span.handle.icon-handle') ); self.el[self.data.quality ? 'removeClass' : 'addClass']('is_empty'); @@ -318,9 +313,6 @@ Profile.Type = new Class({ if(self.data.quality && Quality.getQuality(self.data.quality).allow_3d) self.el.addClass('allow_3d'); - self.finish_class = new Form.Check(self.finish); - self['3d_class'] = new Form.Check(self['3d']); - }, fillQualities: function(){ diff --git a/couchpotato/core/plugins/profile/static/profile.scss b/couchpotato/core/plugins/profile/static/profile.scss index df93944..787a7a0 100644 --- a/couchpotato/core/plugins/profile/static/profile.scss +++ b/couchpotato/core/plugins/profile/static/profile.scss @@ -1,197 +1,152 @@ +@import "couchpotato/static/style/_mixins"; + .add_new_profile { padding: 20px; display: block; text-align: center; font-size: 20px; - border-bottom: 1px solid rgba(255,255,255,0.2); + border-bottom: 1px solid $theme_off; } .profile { - border-bottom: 1px solid rgba(255,255,255,0.2); - position: relative; -} + margin-bottom: 20px; - .profile > .delete { - position: absolute; - padding: 16px; - right: 0; - cursor: pointer; - opacity: 0.6; - color: #fd5353; + .quality_label input { + font-weight: bold; } - .profile > .delete:hover { - opacity: 1; - } - .profile .ctrlHolder:hover { - background: none; - } + .ctrlHolder { - .profile .qualities { - min-height: 80px; - } + .types { + flex: 1 1 auto; + min-width: 360px; - .profile .formHint { - width: 210px !important; - vertical-align: top !important; - margin: 0 !important; - padding-left: 3px !important; - opacity: 0.1; - } - .profile:hover .formHint { - opacity: 1; - } + .type { + display: flex; + flex-row: row nowrap; + align-items: center; + padding: 2px 0; - .profile .wait_for { - padding-top: 0; - padding-bottom: 20px; - } + label { + min-width: 0; + margin-left: $padding/2; - .profile .wait_for input { - margin: 0 5px !important; - } - - .profile .wait_for .minimum_score_input { - width: 40px !important; - text-align: left; - } - - .profile .types { - padding: 0; - margin: 0 20px 0 -4px; - display: inline-block; - } + span { + font-size: .9em; + } + } - .profile .types li { - padding: 3px 5px; - border-bottom: 1px solid rgba(255,255,255,0.2); - list-style: none; - } - .profile .types li:last-child { border: 0; } + input[type=checkbox] { + margin-right: 3px; + } - .profile .types li > * { - display: inline-block; - vertical-align: middle; - line-height: 0; - margin-right: 10px; - } + .delete, .handle { + margin-left: $padding/4; + width: 20px; + font-size: 20px; + opacity: .1; + text-align: center; + cursor: pointer; + + &.handle { + cursor: -webkit-grab; + cursor: -moz-grab; + cursor: grab; + } + + &:hover { + opacity: 1; + } + } - .profile .type .check { - margin-top: -1px; + &.is_empty { + .delete, .handle { + display: none; + } + } } - .profile .quality_type select { - width: 120px; - margin-left: -1px; - } + } - .profile .types li.is_empty .check, - .profile .types li.is_empty .delete, - .profile .types li.is_empty .handle, - .profile .types li.is_empty .check_label { - visibility: hidden; - } + &.wait_for.wait_for { + display: block; - .profile .types .type label { - display: inline-block; - width: auto; - float: none; - text-transform: uppercase; - font-size: 11px; - font-weight: normal; - margin-right: 20px; - text-shadow: none; - vertical-align: bottom; - padding: 0; - height: 17px; + input { + min-width: 0; + width: 40px; + text-align: center; + margin: 0 2px; } - .profile .types .type label .check { - margin-right: 5px; - } - .profile .types .type label .check_label { - display: inline-block; - vertical-align: top; - height: 16px; - line-height: 13px; - } - .profile .types .type .threed { - display: none; - } + .advanced { + display: none; + color: $primary_color; - .profile .types .type.allow_3d .threed { - display: inline-block; + .show_advanced & { + display: inline; } + } - .profile .types .type .handle { - background: url('../../images/handle.png') center; - display: inline-block; - height: 20px; - width: 20px; - cursor: -moz-grab; - cursor: -webkit-grab; - cursor: grab; - margin: 0; - } - - .profile .types .type .delete { - height: 20px; - width: 20px; - line-height: 20px; - visibility: hidden; - cursor: pointer; - font-size: 13px; - color: #fd5353; - } - .profile .types .type:not(.allow_3d) .delete { - margin-left: 55px; } - .profile .types .type:hover:not(.is_empty) .delete { - visibility: visible; + .formHint { } -#profile_ordering { - + } } - #profile_ordering ul { - float: left; +#profile_ordering { + ul { + list-style: none; margin: 0; width: 275px; padding: 0; } - #profile_ordering li { - border-bottom: 1px solid rgba(255,255,255,0.2); - padding: 0 5px; + li { + border-bottom: 1px solid $theme_off; + padding: 5px; + display: flex; + align-items: center; + + &:hover { + background: $theme_off; } - #profile_ordering li:last-child { border: 0; } - #profile_ordering li .check { - margin: 2px 10px 0 0; - vertical-align: top; - } + &:last-child { border: 0; } - #profile_ordering li > span { - display: inline-block; - height: 20px; - vertical-align: top; - line-height: 20px; + input[type=checkbox] { + margin: 2px 10px 0 0; + vertical-align: top; + } + + > span { + display: inline-block; + height: 20px; + vertical-align: top; + line-height: 20px; + + &.profile_label { + flex: 1 1 auto; } + } - #profile_ordering li .handle { - background: url('../../images/handle.png') center; - width: 20px; - float: right; - cursor: -webkit-grab; - cursor: -moz-grab; - cursor: grab; + .handle { + font-size: 20px; + width: 20px; + float: right; + cursor: -webkit-grab; + cursor: -moz-grab; + cursor: grab; + opacity: .5; + text-align: center; + + &:hover { + opacity: 1; } + } + } - #profile_ordering .formHint { - clear: none; - float: right; - width: 250px; - margin: 0; + .formHint { } +} \ No newline at end of file diff --git a/couchpotato/core/plugins/quality/static/quality.js b/couchpotato/core/plugins/quality/static/quality.js index 5db7dd9..4025f95 100644 --- a/couchpotato/core/plugins/quality/static/quality.js +++ b/couchpotato/core/plugins/quality/static/quality.js @@ -132,11 +132,8 @@ var QualityBase = new Class({ new Element('span.profile_label', { 'text': profile.data.label }), - new Element('span.handle') + new Element('span.handle.icon-handle') ).inject(self.profiles_list); - - new Form.Check(check); - }); // Sortable diff --git a/couchpotato/core/plugins/quality/static/quality.scss b/couchpotato/core/plugins/quality/static/quality.scss index f71f007..cef35ec 100644 --- a/couchpotato/core/plugins/quality/static/quality.scss +++ b/couchpotato/core/plugins/quality/static/quality.scss @@ -1,26 +1,19 @@ -.group_sizes { - -} +@import "couchpotato/static/style/_mixins"; - .group_sizes .head { - font-weight: bold; - } +.group_sizes { - .group_sizes .ctrlHolder { - padding-top: 4px !important; - padding-bottom: 4px !important; - font-size: 12px; + .item { + .label { + min-width: 150px; } - .group_sizes .label { - max-width: 120px; + .min, .max { + display: inline-block; + width: 70px !important; + min-width: 0 !important; + margin-right: $padding/2; + text-align: center; } + } - .group_sizes .min, .group_sizes .max { - text-align: center; - width: 50px; - max-width: 50px; - margin: 0 5px !important; - padding: 0 3px; - display: inline-block; - } \ No newline at end of file +} \ No newline at end of file diff --git a/couchpotato/static/fonts/config.json b/couchpotato/static/fonts/config.json index 5164161..6957d39 100644 --- a/couchpotato/static/fonts/config.json +++ b/couchpotato/static/fonts/config.json @@ -127,6 +127,12 @@ "src": "fontawesome" }, { + "uid": "2cfb3f2b46b34a1790aec0aa846297b6", + "css": "menu", + "code": 59417, + "src": "entypo" + }, + { "uid": "c311c48d79488965b0fab7f9cd12b6b5", "css": "left-arrow", "code": 59392, diff --git a/couchpotato/static/fonts/icons.eot b/couchpotato/static/fonts/icons.eot index 91b23c897fb012992e9725ddeb135cdc10a26a97..1120467ebaa86c4f558ef591aec087321ce47f64 100644 GIT binary patch delta 476 zcmccMcg3IWiaG;>h5AG`GZqIm%fk~L^6Lc{7#Q9FaaeM0V!;J1$?Xgbj4nXzm0VV$ z02BuTX$K&|l~$0R+c9B6B#`gJz`$LQo>*J}6bI^;wgA!`={c2YN94XGGB7YrU| zgSZTkZ;_i=QNVDF#|X#=8K97tn47wVuk1UJUjnpbWkG&%3DeCLSquzP3P1;o6%?fw z+|6cgWnfU-15{tlz{s3Fxrfo7QF8JbMn^`;&3sJRBK6EbDF&uJOc4y+4B`yR3|!k~ zBm{U^7?^dn8I8n5*pwBO)J)8bO~IrhSVRy>oT*DpMo#4K3K2OOF%V{o0PzuGj1%NE z$EOKxgjDZ^%8X=WY(VfJjc delta 342 zcmccOf5DF}K%IeMi`qmsGnV-Wz8s(EkY6vxz`*bZh{KX|6ALbAN^WOhU~~auujH~4 z1)w+(NbLah2V^pcSpbQQoc!cOM?;$w zAb$anZCFZ7X;Vb(N~=EL + \ No newline at end of file diff --git a/couchpotato/static/fonts/icons.ttf b/couchpotato/static/fonts/icons.ttf index b2def14fac36b4357d5372ddf8d540865f4bbf4c..052272e1648ddddf125eb89b683a650157f3aa8a 100644 GIT binary patch delta 489 zcmdnuyTh-ZfsuiMfsdhqftew}KUm+$PSaBWDDnn~!;*6o3od9$Zf9U%bOB00hNs0l8WfZKo*181|X4>lb@XEXyoR` zz#uLIRunKC<1qsAK?W$~CFZ7X;Vb(N~7!24-DtMk6s1Hf2R6H4`&qQ!uFr77;`eXX+A@krVm5LPSnR z41}2?KzxK4;{-VkIUq`bQ2(w#XrN<()&jB2VM{fKcz&C&4BX5wKu)>1VDVfCU70&c z%$!krvV~X%6Vsl_^Tf{QW*z_s C7HzQr delta 356 zcmdntx5c-ffsuiMfsdhqftew}KUm+$PSaBiDDnn~!;*6o3od9%Zf9U%bOBQ6D8(W&qz`!(tfkD_S zBQ-IFPQyaf0cIk8e({5Hn|#n!G_QW3r66Dd$p%4hE^sQR2^;fD%qp PCX*|qwr@6-X669^b6Hie diff --git a/couchpotato/static/fonts/icons.woff b/couchpotato/static/fonts/icons.woff index 1f6b0a429ac04357374124008f579625d1834669..793d9e0ce4fba09c1588c50800da00d211a00d72 100644 GIT binary patch delta 3873 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 KL*xLHU>9i4ED;d^ diff --git a/couchpotato/static/style/_fonts.scss b/couchpotato/static/style/_fonts.scss index 2c7b564..b772523 100644 --- a/couchpotato/static/style/_fonts.scss +++ b/couchpotato/static/style/_fonts.scss @@ -1,11 +1,11 @@ /* Fonts */ @font-face { font-family: 'icons'; - src: url('../fonts/icons.eot?74719541'); - src: url('../fonts/icons.eot?74719541#iefix') format('embedded-opentype'), - url('../fonts/icons.woff?74719541') format('woff'), - url('../fonts/icons.ttf?74719541') format('truetype'), - url('../fonts/icons.svg?74719541#icons') format('svg'); + src: url('../fonts/icons.eot?74719542'); + src: url('../fonts/icons.eot?74719542#iefix') format('embedded-opentype'), + url('../fonts/icons.woff?747195412') format('woff'), + url('../fonts/icons.ttf?74719542') format('truetype'), + url('../fonts/icons.svg?74719542#icons') format('svg'); font-weight: normal; font-style: normal; } @@ -44,6 +44,7 @@ .icon-refresh:before { content: '\e816'; } .icon-home:before { content: '\e817'; } .icon-movie:before { content: '\e818'; } +.icon-menu:before, .icon-handle:before { content: '\e819'; } @font-face { font-family: 'OpenSans'; diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css index f42e395..b3a7e98 100644 --- a/couchpotato/static/style/combined.min.css +++ b/couchpotato/static/style/combined.min.css @@ -318,43 +318,32 @@ .report_popup.report_popup .button{display:inline-block;margin:10px 0;padding:10px;color:#FFF} .report_popup.report_popup .bug{width:80%;height:80%;max-height:800px;max-width:800px;display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap} .report_popup.report_popup .bug textarea{display:block;width:100%;background:#FFF;padding:20px;overflow:auto;color:#666;height:70%;font-size:12px} -.do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF}.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid rgba(255,255,255,.2)} -.profile{border-bottom:1px solid rgba(255,255,255,.2);position:relative} -.profile>.delete{position:absolute;padding:16px;right:0;cursor:pointer;opacity:.6;color:#fd5353} -.profile>.delete:hover{opacity:1} -.profile .ctrlHolder:hover{background:0 0} -.profile .qualities{min-height:80px} -.profile .formHint{width:210px!important;vertical-align:top!important;margin:0!important;padding-left:3px!important;opacity:.1} -.profile:hover .formHint{opacity:1} -.profile .wait_for{padding-top:0;padding-bottom:20px} -.profile .wait_for input{margin:0 5px!important} -.profile .wait_for .minimum_score_input{width:40px!important;text-align:left} -.profile .types{padding:0;margin:0 20px 0 -4px;display:inline-block} -.profile .types li{padding:3px 5px;border-bottom:1px solid rgba(255,255,255,.2);list-style:none} -.profile .types li:last-child{border:0} -.profile .types li>*{display:inline-block;vertical-align:middle;line-height:0;margin-right:10px} -.profile .type .check{margin-top:-1px} -.profile .quality_type select{width:120px;margin-left:-1px} -.profile .types li.is_empty .check,.profile .types li.is_empty .check_label,.profile .types li.is_empty .delete,.profile .types li.is_empty .handle{visibility:hidden} -.profile .types .type label{display:inline-block;width:auto;float:none;text-transform:uppercase;font-size:11px;font-weight:400;margin-right:20px;text-shadow:none;vertical-align:bottom;padding:0;height:17px} -.profile .types .type label .check{margin-right:5px} -.profile .types .type label .check_label{display:inline-block;vertical-align:top;height:16px;line-height:13px} -.profile .types .type .threed{display:none} -.profile .types .type.allow_3d .threed{display:inline-block} -.profile .types .type .handle{background:url(../../images/handle.png) center;display:inline-block;height:20px;width:20px;cursor:-moz-grab;cursor:-webkit-grab;cursor:grab;margin:0} -.profile .types .type .delete{height:20px;width:20px;line-height:20px;visibility:hidden;cursor:pointer;font-size:13px;color:#fd5353} -.profile .types .type:not(.allow_3d) .delete{margin-left:55px} -.profile .types .type:hover:not(.is_empty) .delete{visibility:visible} -#profile_ordering ul{float:left;margin:0;width:275px;padding:0} -#profile_ordering li{border-bottom:1px solid rgba(255,255,255,.2);padding:0 5px} +.do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF}.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid #eaeaea} +.profile{margin-bottom:20px} +.profile .quality_label input{font-weight:700} +.profile .ctrlHolder .types{-webkit-box-flex:1;-webkit-flex:1 1 auto;-moz-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;min-width:360px} +.profile .ctrlHolder .types .type{display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;flex-row:row nowrap;-webkit-box-align:center;-webkit-align-items:center;-moz-box-align:center;-ms-flex-align:center;align-items:center;padding:2px 0} +.profile .ctrlHolder .types .type label{min-width:0;margin-left:10px} +.profile .ctrlHolder .types .type label span{font-size:.9em} +.profile .ctrlHolder .types .type input[type=checkbox]{margin-right:3px} +.profile .ctrlHolder .types .type .delete,.profile .ctrlHolder .types .type .handle{margin-left:5px;width:20px;font-size:20px;opacity:.1;text-align:center;cursor:pointer} +.profile .ctrlHolder .types .type .delete.handle,.profile .ctrlHolder .types .type .handle.handle{cursor:-webkit-grab;cursor:-moz-grab;cursor:grab} +.profile .ctrlHolder .types .type .delete:hover,.profile .ctrlHolder .types .type .handle:hover{opacity:1} +.profile .ctrlHolder .types .type.is_empty .delete,.profile .ctrlHolder .types .type.is_empty .handle{display:none} +.profile .ctrlHolder.wait_for.wait_for{display:block} +.profile .ctrlHolder.wait_for.wait_for input{min-width:0;width:40px;text-align:center;margin:0 2px} +.profile .ctrlHolder.wait_for.wait_for .advanced{display:none;color:#ac0000} +.show_advanced .profile .ctrlHolder.wait_for.wait_for .advanced{display:inline} +#profile_ordering ul{list-style:none;margin:0;width:275px;padding:0} +#profile_ordering li{border-bottom:1px solid #eaeaea;padding:5px;display:-webkit-box;display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-moz-box-align:center;-ms-flex-align:center;align-items:center} +#profile_ordering li:hover{background:#eaeaea} #profile_ordering li:last-child{border:0} -#profile_ordering li .check{margin:2px 10px 0 0;vertical-align:top} +#profile_ordering li input[type=checkbox]{margin:2px 10px 0 0;vertical-align:top} #profile_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px} -#profile_ordering li .handle{background:url(../../images/handle.png) center;width:20px;float:right;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab} -#profile_ordering .formHint{clear:none;float:right;width:250px;margin:0}.group_sizes .head{font-weight:700} -.group_sizes .ctrlHolder{padding-top:4px!important;padding-bottom:4px!important;font-size:12px} -.group_sizes .label{max-width:120px} -.group_sizes .max,.group_sizes .min{text-align:center;width:50px;max-width:50px;margin:0 5px!important;padding:0 3px;display:inline-block}.page.userscript{position:absolute;width:100%;top:0;bottom:0;left:0;right:0;padding:0} +#profile_ordering li>span.profile_label{-webkit-box-flex:1;-webkit-flex:1 1 auto;-moz-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto} +#profile_ordering li .handle{font-size:20px;width:20px;float:right;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab;opacity:.5;text-align:center} +#profile_ordering li .handle:hover{opacity:1}.group_sizes .item .label{min-width:150px} +.group_sizes .item .max,.group_sizes .item .min{display:inline-block;width:70px!important;min-width:0!important;margin-right:10px;text-align:center}.page.userscript{position:absolute;width:100%;top:0;bottom:0;left:0;right:0;padding:0} .page.userscript .frame.loading{text-align:center;font-size:20px;padding:20px} .page.userscript .media_result{height:140px} .page.userscript .media_result .thumbnail{width:90px} @@ -408,7 +397,7 @@ .page.login input[type=password],.page.login input[type=text]{width:100%!important;font-size:25px;padding:14px!important} .page.login .remember_me{font-size:15px;float:left;width:150px;padding:20px 0} .page.login .remember_me .check{margin:5px 5px 0 0} -.page.login .button{font-size:25px;padding:20px;float:right}@font-face{font-family:icons;src:url(../fonts/icons.eot?74719541);src:url(../fonts/icons.eot?74719541#iefix) format("embedded-opentype"),url(../fonts/icons.woff?74719541) format("woff"),url(../fonts/icons.ttf?74719541) format("truetype"),url(../fonts/icons.svg?74719541#icons) format("svg");font-weight:400;font-style:normal} +.page.login .button{font-size:25px;padding:20px;float:right}@font-face{font-family:icons;src:url(../fonts/icons.eot?74719542);src:url(../fonts/icons.eot?74719542#iefix) format("embedded-opentype"),url(../fonts/icons.woff?747195412) format("woff"),url(../fonts/icons.ttf?74719542) format("truetype"),url(../fonts/icons.svg?74719542#icons) format("svg");font-weight:400;font-style:normal} [class*=" icon-"]:before,[class^=icon-]:before{font-family:icons;font-style:normal;font-weight:400;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale} .icon-left-arrow:before{content:'\e800'} .icon-settings:before{content:'\e801'} @@ -435,6 +424,7 @@ .icon-refresh:before{content:'\e816'} .icon-home:before{content:'\e817'} .icon-movie:before{content:'\e818'} +.icon-handle:before,.icon-menu:before{content:'\e819'} @font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff) format("woff"),url(../fonts/OpenSans-Light-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular) format("svg");font-weight:200;font-style:normal} @font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff) format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular) format("svg");font-weight:400;font-style:normal} @font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff) format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic) format("svg");font-weight:400;font-style:italic}