ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 00:28:00 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra

Browse Source 
Conflicts:
	js/routes.js
This commit is contained in:
Tim Daubenschütz 2015-09-25 16:23:01 +02:00
commit f2b4c23bd7
4 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/whitelabel/prize/prize_routes.js
View File

@ -13,6 +13,7 @@ import PrizePieceList from './components/prize_piece_list';
import PrizePieceContainer from './components/ascribe_detail/prize_piece_container';
import EditionContainer from '../../ascribe_detail/edition_container';
import SettingsContainer from './components/prize_settings_container';
import CoaVerifyContainer from '../../../components/coa_verify_container';
import App from './prize_app';
import AppConstants from '../../../constants/application_constants';
@ -34,6 +35,7 @@ function getRoutes() {
<Route name="piece" path="pieces/:pieceId" handler={PrizePieceContainer} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
<Route name="coa_verify" path="verify" handler={CoaVerifyContainer} />
</Route>
);
}

4
js/components/whitelabel/wallet/wallet_routes.js
View File

@ -4,6 +4,7 @@ import React from 'react';
import Router from 'react-router';
// general components
import CoaVerifyContainer from '../../../components/coa_verify_container';
import LoginContainer from '../../../components/login_container';
import LogoutContainer from '../../../components/logout_container';
import SignupContainer from '../../../components/signup_container';
@ -48,6 +49,7 @@ let ROUTES = {
<Route name="pieces" path="collection" handler={CylandPieceList} headerTitle="COLLECTION" />
<Route name="piece" path="pieces/:pieceId" handler={CylandPieceContainer} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="coa_verify" path="verify" handler={CoaVerifyContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
</Route>
),
@ -63,6 +65,7 @@ let ROUTES = {
<Route name="pieces" path="collection" handler={PieceList} headerTitle="COLLECTION" />
<Route name="piece" path="pieces/:pieceId" handler={PieceContainer} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="coa_verify" path="verify" handler={CoaVerifyContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
</Route>
),
@ -78,6 +81,7 @@ let ROUTES = {
<Route name="pieces" path="collection" handler={IkonotvPieceList} headerTitle="COLLECTION"/>
<Route name="piece" path="pieces/:pieceId" handler={IkonotvPieceContainer} />
<Route name="edition" path="editions/:editionId" handler={EditionContainer} />
<Route name="coa_verify" path="verify" handler={CoaVerifyContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
<Route name="contract_notifications" path="contract_notifications" handler={IkonotvContractNotifications} />
</Route>

2
js/routes.js
View File

@ -21,7 +21,6 @@ import SettingsContainer from './components/ascribe_settings/settings_container'
import CoaVerifyContainer from './components/coa_verify_container';
import RegisterPiece from './components/register_piece';
import ContractNotification from './components/contract_notification';
import AppConstants from './constants/application_constants';
@ -44,7 +43,6 @@ const COMMON_ROUTES = (
<Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
<Route name="settings" path="settings" handler={SettingsContainer} />
<Route name="coa_verify" path="verify" handler={CoaVerifyContainer} />
<Route name="contract_notifications" path="verify" handler={ContractNotification} />
</Route>
);

28
sass/main.scss
View File

@ -123,34 +123,6 @@ 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;