diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 0d29ead51..09f4ce358 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,7 +3,6 @@ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. *= require_self - *= require ./bootstrap-glyphicons.css *= require ./bootstrap.css *= require ./fineuploader.css *= require ./ui-lightness/jquery-ui-1.8.23.custom.css diff --git a/app/assets/stylesheets/bootstrap-glyphicons.css b/app/assets/stylesheets/bootstrap-glyphicons.css deleted file mode 100755 index 120cc1c9b..000000000 --- a/app/assets/stylesheets/bootstrap-glyphicons.css +++ /dev/null @@ -1,2 +0,0 @@ -@font-face{font-family:'Glyphicons Halflings';src:url('../assets/fonts/glyphiconshalflings-regular.eot');src:url('../assets/fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),url('../assets/fonts/glyphiconshalflings-regular.woff') format('woff'),url('../assets/fonts/glyphiconshalflings-regular.ttf') format('truetype'),url('../assets/fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon:before{font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-plus:before{content:"\002b"}.glyphicon-minus:before{content:"\2212"}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse:before{content:"\e159"}.glyphicon-collapse-top:before{content:"\e160"} -/* This beautiful CSS-File has been crafted with LESS (lesscss.org) and compiled by simpLESS (wearekiss.com/simpless) */ diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index ab0d86e4c..dc5be89e1 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -48,7 +48,7 @@ input[type="color"], float: left; background:url("/assets/spinner.gif") no-repeat; background-position: center center; - padding: 46px 10px 0 10px; + padding: 44px 10px 0 10px; width: 10px; height: 14px; display: none; @@ -88,9 +88,9 @@ table th, table td { .content-two { top: 80px; - bottom: 0px; - left: 0px; - right: 0px; + bottom: 0; + left: 0; + right: 0; position: fixed; z-index: -5000; } @@ -187,15 +187,15 @@ table th, table td { width: 100%; height: 100%; table-layout: fixed; - border-spacing: 0px; + border-spacing: 0; } .content-cols .row { - margin: 0px; + margin: 0; } .content-cols .row2 > div { display: table-cell; vertical-align: top; - padding: 0px 12px 0px 12px; + padding: 0 12px 0 12px; } .content-cols .row2 .sidebar { border-right: 1px solid #eeeeee; @@ -268,7 +268,7 @@ table th, table td { position: fixed; display: table; width: 100%; - top: 48px; + top: 46px; } #task > .taskbar { @@ -277,7 +277,7 @@ table th, table td { } #task > .taskbar > div { - padding: 0px 4px 4px 4px; + padding: 0 4px 4px 4px; display: table-cell; } @@ -300,7 +300,7 @@ table th, table td { } #task .taskbar .btn-small { - padding: 5px 10px; + padding: 5px 10px 7px; margin-top: 2px; font-size: 11px; font-weight: 300; @@ -313,8 +313,8 @@ table th, table td { #task [data-type="close"] { margin-left: 5px; - font-size: 10px; - vertical-align: middle; + font-size: 13px; + top: 1px; } #task .taskbar-items { @@ -388,8 +388,8 @@ h5 { .form-horizontal label { text-align: right; float: left; - margin-left: 0px; - margin-right: 0px; + margin-left: 0; + margin-right: 0; width: 130px; margin-top: 7px; } @@ -522,11 +522,11 @@ form.form-inline input[type="password"] { .edit { min-height:30px; - bottom: 0px; + bottom: 0; /* position: fixed; */ padding: 2px 14px; width: 720px; - margin-bottom: 0px; + margin-bottom: 0; } .edit .form-group { margin-bottom: 2px; @@ -626,12 +626,12 @@ footer { width: 100%; margin-left: 0; - margin-top: 0px; + margin-top: 0; margin-bottom: 10px; - padding-top: 0px; + padding-top: 0; padding-bottom: 2px; - padding-right: 0px; + padding-right: 0; border-bottom: 1px solid #eeeeee; } @@ -643,7 +643,7 @@ footer { .article-message { padding: 4px 2px; /* - margin-top: 0px; + margin-top: 0; margin-bottom: 6px; margin-left: 10px; @@ -697,9 +697,12 @@ footer { min-height: 46px; } +.navbar-form { + margin-top: 6px; + margin-bottom: 6px; +} + .nav .form-control { - height: 34px; - margin-top: 1px; border-radius: 8px; } @@ -713,10 +716,14 @@ footer { .navbar-brand { line-height: 18px; font-weight: 200; + padding-top: 13px; + padding-bottom: 13px; } .navbar-nav > li > a { line-height: 18px; + padding-top: 13px; + padding-bottom: 13px; } .navbar .bell { @@ -809,7 +816,7 @@ footer { } .qq-upload-icon { - margin: 6px 20px 0px 0px; + margin: 6px 20px 0 0; height: 18px; } .qq-upload-icon .glyphicon { @@ -826,7 +833,7 @@ footer { .qq-upload-list { text-align: left; - margin: 5px 10px 0px; + margin: 5px 10px 0; padding: 0; list-style: disc; } @@ -854,7 +861,7 @@ footer { background-color: #eee; position: absolute; width: 100%; - top: 0px; + top: 0; height: 100%; } #splash .logo { @@ -863,3 +870,9 @@ footer { margin-top: 200px; width: 100px; } + +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('fonts/glyphicons-halflings-regular.eot'); + src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); +} \ No newline at end of file diff --git a/public/assets/fonts/glyphiconshalflings-regular.eot b/public/assets/fonts/glyphiconshalflings-regular.eot deleted file mode 100755 index bd59ccd2d..000000000 Binary files a/public/assets/fonts/glyphiconshalflings-regular.eot and /dev/null differ diff --git a/public/assets/fonts/glyphiconshalflings-regular.otf b/public/assets/fonts/glyphiconshalflings-regular.otf deleted file mode 100755 index b058f1cd1..000000000 Binary files a/public/assets/fonts/glyphiconshalflings-regular.otf and /dev/null differ diff --git a/public/assets/fonts/glyphiconshalflings-regular.svg b/public/assets/fonts/glyphiconshalflings-regular.svg deleted file mode 100755 index 0fb458735..000000000 --- a/public/assets/fonts/glyphiconshalflings-regular.svg +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/assets/fonts/glyphiconshalflings-regular.ttf b/public/assets/fonts/glyphiconshalflings-regular.ttf deleted file mode 100755 index c63c068fe..000000000 Binary files a/public/assets/fonts/glyphiconshalflings-regular.ttf and /dev/null differ diff --git a/public/assets/fonts/glyphiconshalflings-regular.woff b/public/assets/fonts/glyphiconshalflings-regular.woff deleted file mode 100755 index 4c778ffdc..000000000 Binary files a/public/assets/fonts/glyphiconshalflings-regular.woff and /dev/null differ