diff --git a/app/assets/stylesheets/app/_fonts.scss b/app/assets/stylesheets/app/_fonts.scss deleted file mode 100644 index 2d5708715..000000000 --- a/app/assets/stylesheets/app/_fonts.scss +++ /dev/null @@ -1,92 +0,0 @@ -@font-face { - font-family: ProximaNova; - src: font-url('ProximaNova/ProximaNova-Regular.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Regular.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Regular.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Regular.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-style: italic; - src: font-url('ProximaNova/ProximaNova-Regular-Italic.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Regular-Italic.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Regular-Italic.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Regular-Italic.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: 600; - src: font-url('ProximaNova/ProximaNova-Semibold.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Semibold.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Semibold.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Semibold.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: 600; - font-style: italic; - src: font-url('ProximaNova/ProximaNova-Semibold-Italic.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Semibold-Italic.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Semibold-Italic.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Semibold-Italic.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: bold; - src: font-url('ProximaNova/ProximaNova-Bold.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Bold.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Bold.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Bold.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: bold; - font-style: italic; - src: font-url('ProximaNova/ProximaNova-Bold-Italic.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Bold-Italic.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Bold-Italic.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Bold-Italic.svg') format('svg'); -} - - -@font-face { - font-family: ProximaNova; - font-weight: 100; - src: font-url('fonts/ProximaNova-Thin.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Thin.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Thin.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Thin.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: 100; - font-style: italic; - src: font-url('fonts/ProximaNova-Thin-Italic.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Thin-Italic.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Thin-Italic.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Thin-Italic.svg') format('svg'); -} - -@font-face { - font-family: ProximaNova; - font-weight: 900; - src: font-url('ProximaNova/ProximaNova-Extrabold.eot'); - src: local('☺'), - font-url('ProximaNova/ProximaNova-Extrabold.woff') format('woff'), - font-url('ProximaNova/ProximaNova-Extrabold.ttf') format('truetype'), - font-url('ProximaNova/ProximaNova-Extrabold.svg') format('svg'); -} diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index b71e01bac..65b5a2a9c 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -29,10 +29,6 @@ $blue-color: #086dd6; } } -[ng\:cloak], [ng-cloak], .ng-cloak { - display: none !important; -} - html, body { font-family: -apple-system, BlinkMacSystemFont, @@ -72,19 +68,6 @@ a { } } -pre { - padding: 16px; - overflow: auto; - line-height: 1.45; - background-color: #f7f7f7; - border-radius: 3px; -} - -code { - word-wrap: break-word; - line-height: 1.45; -} - p { overflow: auto; } diff --git a/app/assets/stylesheets/app/_mostrap.scss b/app/assets/stylesheets/app/_mostrap.scss index 7b540f5b0..2776256a1 100644 --- a/app/assets/stylesheets/app/_mostrap.scss +++ b/app/assets/stylesheets/app/_mostrap.scss @@ -7,15 +7,11 @@ $screen-xs: 480px !default; //** Deprecated `$screen-xs-min` as of v3.2.0 $screen-xs-min: $screen-xs !default; -//** Deprecated `$screen-phone` as of v3.0.1 -$screen-phone: $screen-xs-min !default; // Small screen / tablet //** Deprecated `$screen-sm` as of v3.0.1 $screen-sm: 768px !default; $screen-sm-min: $screen-sm !default; -//** Deprecated `$screen-tablet` as of v3.0.1 -$screen-tablet: $screen-sm-min !default; // Medium screen / desktop //** Deprecated `$screen-md` as of v3.0.1 @@ -67,111 +63,6 @@ $screen-md-max: ($screen-lg-min - 1) !default; *:focus {outline:0;} -.navbar { - min-height: 0px !important; - background-color: white; - height: 80px; - margin-bottom: 0px; - padding-top: 10px; - border-radius: 0px; -} -@media (min-width: 768px) { - .navbar { - border-radius: 4px; - } -} - -.navbar { - position: relative; - min-height: 50px; - margin-bottom: 20px; - border: 1px solid transparent; -} - -@media (min-width: 768px) { - .navbar-header { - float: left; - } -} - -.container > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-header, .container-fluid > .navbar-collapse { - margin-right: 0; - margin-left: 0; -} - -@media (min-width: 768px) { - .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { - // margin-left: -15px; - } -} - -.navbar-brand { - float: left; - padding: 15px 15px; - font-size: 18px; - line-height: 20px; - height: 50px; -} - -@media (min-width: 768px) { - .container > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-header, .container-fluid > .navbar-collapse { - // margin-right: 0; - // margin-left: 0; - } -} - -.container > .navbar-header, .container > .navbar-collapse, .container-fluid > .navbar-header, .container-fluid > .navbar-collapse { - // margin-right: -15px; - // margin-left: -15px; -} - -@media (min-width: 768px) { - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } -} -@media (min-width: 768px) { - .navbar-collapse { - width: auto; - border-top: 0; - box-shadow: none; - } -} - -.navbar-collapse { - overflow-x: visible; - padding-right: 15px; - padding-left: 15px; - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); - -webkit-overflow-scrolling: touch; -} - -.collapse { - display: none; -} - -@media (min-width: 768px) { - .navbar-right { - float: right !important; - // margin-right: -15px; - } -} -@media (min-width: 768px) { - .navbar-text { - float: left; - margin-left: 15px; - margin-right: 15px; - } -} -.navbar-text { - margin-top: 15px; - margin-bottom: 15px; -} - .dropup, .dropdown { position: relative; } @@ -232,10 +123,6 @@ button:focus {outline:0;} right: 0; } -.open > .dropdown-menu { - display: block; -} - .btn { display: inline-block; margin-bottom: 0; @@ -262,23 +149,6 @@ button:focus {outline:0;} width: 100%; } -// ul, menu, dir { -// display: block; -// list-style-type: disc; -// -webkit-margin-before: 1em; -// -webkit-margin-after: 1em; -// -webkit-margin-start: 0px; -// -webkit-margin-end: 0px; -// -webkit-padding-start: 40px; -// } - -.dropdown-menu .divider { - height: 1px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5; -} - .panel { position: absolute; right: 0px; @@ -290,59 +160,35 @@ button:focus {outline:0;} background-color: white; } -.panel-top { - bottom: 0px; -} - -.panel-left { - left: -50px; -} - .panel-right { left: 0px; } -.panel-centered { - position: relative; - width: 400px; - margin: 0 auto; - padding: 10px; - text-align: center; -} - .panel-body { padding: 15px; } .form-control { - display: block; - width: 100%; - height: 34px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857; - color: #555555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; - border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); - -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; - transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + display: block; + width: 100%; + height: 34px; + padding: 6px 12px; + font-size: 14px; + line-height: 1.42857; + color: #555555; + background-color: #fff; + background-image: none; + border: 1px solid #ccc; + border-radius: 4px; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; } input, button, select, textarea { - font-family: inherit; - font-size: inherit; - line-height: inherit; -} - -.has-feedback { - position: relative; -} - -.form-tag { - margin-bottom: 15px; + font-family: inherit; + font-size: inherit; + line-height: inherit; } .checkbox { @@ -352,63 +198,3 @@ input, button, select, textarea { margin-right: auto; margin-bottom: 10px; } - -.btn-link { - background-color: transparent; - -webkit-box-shadow: none; - box-shadow: none; - text-decoration: none; -} - -.btn-link:hover, .btn-link:focus { - color: #23527c; - text-decoration: underline; - background-color: transparent; -} - -.animated { - -webkit-animation-duration: 1s; - animation-duration: 1s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; -} - -.animated-fast { - -webkit-animation-duration: 0.5s; - animation-duration: 0.5s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; -} - -.fadeInDown { - -webkit-animation-name: fadeInDown; - animation-name: fadeInDown; -} - -.fadeIn { - -webkit-animation-name: fadeIn; - animation-name: fadeIn; -} - -@keyframes fadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -@keyframes fadeInDown { - 0% { - opacity: 0; - -webkit-transform: translate3d(0,-100%,0); - transform: translate3d(0,-100%,0); - } - 100% { - opacity: 1; - -webkit-transform: none; - transform: none; - } -}