From 6a57a69e2944248bfb9e40abed1380f068a7af2c Mon Sep 17 00:00:00 2001 From: Cevo Date: Fri, 4 Sep 2015 16:18:29 +0200 Subject: [PATCH] main.scss edited --- js/components/ascribe_detail/edition.js | 2 +- .../components/ikonotv/ikonotv_piece_list.js | 1 - sass/main.scss | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 47761e39..aa3d81ba 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -14,7 +14,7 @@ import CoaActions from '../../actions/coa_actions'; import CoaStore from '../../stores/coa_store'; import PieceListActions from '../../actions/piece_list_actions'; import PieceListStore from '../../stores/piece_list_store'; -import EditionListActions from '../../actions/edition_list_actions';; +import EditionListActions from '../../actions/edition_list_actions'; import HistoryIterator from './history_iterator'; diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js index e4c83d97..4c8766e4 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js @@ -8,7 +8,6 @@ import UserStore from '../../../../../stores/user_store'; import IkonotvAccordionListItem from './ascribe_accordion_list/ikonotv_accordion_list_item'; - let IkonotvPieceList = React.createClass({ getInitialState() { return UserStore.getState(); diff --git a/sass/main.scss b/sass/main.scss index 14526942..ae06eadb 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -122,6 +122,34 @@ hr { height: 60px; } +//http://stackoverflow.com/questions/22228239/bootstrap-navbar-static-top-menu-breaks-on-two-lines +@media (max-width: 990px) { + .navbar-header { + float: none; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin: 7.5px -15px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } +} + .truncate { overflow: hidden; text-overflow: ellipsis;