diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2016-01-31 16:59:04 +0100 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2016-01-31 16:59:04 +0100 |
| commit | eb74eca67026a62dac5d0f8cf92111fad6c73648 (patch) | |
| tree | 5a3e6026172ad85a0b4c0267c859fd65edfcbf9c | |
| parent | reset scrolling when setting right panel (diff) | |
| download | newspipe-eb74eca67026a62dac5d0f8cf92111fad6c73648.tar.gz newspipe-eb74eca67026a62dac5d0f8cf92111fad6c73648.tar.bz2 newspipe-eb74eca67026a62dac5d0f8cf92111fad6c73648.zip | |
fixing breadcrum height
| -rw-r--r-- | src/web/js/components/RightPanel.react.js | 20 | ||||
| -rw-r--r-- | src/web/static/css/one-page-app.css | 14 | ||||
| -rw-r--r-- | src/web/templates/home.html | 4 |
3 files changed, 25 insertions, 13 deletions
diff --git a/src/web/js/components/RightPanel.react.js b/src/web/js/components/RightPanel.react.js index 42f8f8ef..b8f78050 100644 --- a/src/web/js/components/RightPanel.react.js +++ b/src/web/js/components/RightPanel.react.js @@ -299,20 +299,24 @@ var RightPanel = React.createClass({ var brd_article = null; var breadcrum = null; if(this.state.category) { - brd_category = (<li><a onClick={this.selectCategory} href="#"> - {this.state.category.name} - </a></li>); + brd_category = (<li className="rp-crum"> + <a onClick={this.selectCategory} href="#"> + {this.state.category.name} + </a> + </li>); } if(this.state.feed) { - brd_feed = (<li><a onClick={this.selectFeed} href="#"> - {this.state.feed.title} - </a></li>); + brd_feed = (<li className="rp-crum"> + <a onClick={this.selectFeed} href="#"> + {this.state.feed.title} + </a> + </li>); } if(this.state.article) { - brd_article = <li>{this.state.article.title}</li>; + brd_article = <li className="rp-crum">{this.state.article.title}</li>; } if(brd_category || brd_feed || brd_article) { - breadcrum = (<ol className="breadcrumb"> + breadcrum = (<ol className="breadcrumb" id="rp-breadcrum"> {brd_category} {brd_feed} {brd_article} diff --git a/src/web/static/css/one-page-app.css b/src/web/static/css/one-page-app.css index d919a4f7..40f7cd45 100644 --- a/src/web/static/css/one-page-app.css +++ b/src/web/static/css/one-page-app.css @@ -121,8 +121,18 @@ top: 2px; right: 4px; } -#right-panel>ol{ +#right-panel { + top: 50px; +} +#rp-breadcrum{ margin-top: 10px; + max-height: 34px; + overflow: hidden; + padding-top: 2px; +} +#rp-breadcrum>li{ + display: inline; + line-height: 30px; } #right-panel .panel-body img { max-width: 100%; @@ -153,5 +163,3 @@ .filter-row>input.form-control { width: auto; } -#filter-button-row>*{ -} diff --git a/src/web/templates/home.html b/src/web/templates/home.html index 4389ae6f..c2966be7 100644 --- a/src/web/templates/home.html +++ b/src/web/templates/home.html @@ -8,11 +8,11 @@ <meta name="author" content="" /> <title>JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title> <link rel="shortcut icon" href="{{ url_for("static", filename="img/favicon.png") }}" /> - <!-- Bootstrap core CSS --> - <link href="{{ url_for("static", filename="css/bootstrap.min.css") }}" rel="stylesheet" media="screen" /> <!-- Add custom CSS here --> <link href="{{ url_for("static", filename="css/customized-bootstrap.css") }}" rel="stylesheet" media="screen" /> <link href="{{ url_for("static", filename="css/one-page-app.css") }}" rel="stylesheet" media="screen" /> + <!-- Bootstrap core CSS --> + <link href="{{ url_for("static", filename="css/bootstrap.min.css") }}" rel="stylesheet" media="screen" /> {% endblock %} </head> <body> |