Kouhei Sutou
null+****@clear*****
Mon Oct 27 16:08:47 JST 2014
Kouhei Sutou 2014-10-27 16:08:47 +0900 (Mon, 27 Oct 2014) New Revision: 93484fe344a9fe403e27ae3d56b12970ce011fb0 https://github.com/groonga/groonga-admin/commit/93484fe344a9fe403e27ae3d56b12970ce011fb0 Message: Simplify style Modified files: app/index.html app/styles/main.scss app/views/tables/search.html app/views/top.html Modified: app/index.html (+12 -12) =================================================================== --- app/index.html 2014-10-27 15:49:51 +0900 (9f3bb51) +++ app/index.html 2014-10-27 16:08:47 +0900 (aeaa2cd) @@ -21,21 +21,21 @@ <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <![endif]--> - <!-- Add your site or application content here --> - <div class="container"> - <div class="header"> - <ul class="nav nav-pills pull-right"> - <li class="active"><a ng-href="#">Home</a></li> - </ul> - <h3 class="text-muted">Groonga Admin</h3> - </div> - - <div ng-view=""></div> - - <div class="footer"> + <div class="navbar" role="navigation"> + <div class="container-fuild"> + <div class="navbar-header"> + <a class="navbar-brand" href="#">Groonga Admin</a> + </div> + <div class="collapse navbar-collapse"> + <ul class="nav navbar-nav"> + <li><a href="/document/">Document</a></li> + </ul> + </div> </div> </div> + <div ng-view=""></div> + <!-- build:js(.) scripts/oldieshim.js --> <!--[if lt IE 9]> Modified: app/styles/main.scss (+0 -65) =================================================================== --- app/styles/main.scss 2014-10-27 15:49:51 +0900 (7563311) +++ app/styles/main.scss 2014-10-27 16:08:47 +0900 (19b1684) @@ -3,71 +3,6 @@ $icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/boots @import "bootstrap-sass-official/assets/stylesheets/_bootstrap.scss"; // endbower -.browsehappy { - margin: 0.2em 0; - background: #ccc; - color: #000; - padding: 0.2em 0; -} - -/* Space out content a bit */ -body { - padding-top: 20px; - padding-bottom: 20px; -} - -/* Everything but the jumbotron gets side spacing for mobile first views */ -.header, -.marketing, -.footer { - padding-left: 15px; - padding-right: 15px; -} - -/* Custom page header */ -.header { - border-bottom: 1px solid #e5e5e5; - - /* Make the masthead heading the same height as the navigation */ - h3 { - margin-top: 0; - margin-bottom: 0; - line-height: 40px; - padding-bottom: 19px; - } -} - -/* Custom page footer */ -.footer { - padding-top: 19px; - color: #777; - border-top: 1px solid #e5e5e5; -} - -.container-narrow > hr { - margin: 30px 0; -} - -/* Main marketing message and sign up button */ -.jumbotron { - text-align: center; - border-bottom: 1px solid #e5e5e5; - - .btn { - font-size: 21px; - padding: 14px 24px; - } -} - -/* Supporting marketing content */ -.marketing { - margin: 40px 0; - - p + h4 { - margin-top: 28px; - } -} - .table-search-result { @extend .table-responsive; Modified: app/views/tables/search.html (+2 -2) =================================================================== --- app/views/tables/search.html 2014-10-27 15:49:51 +0900 (7902985) +++ app/views/tables/search.html 2014-10-27 16:08:47 +0900 (aedb26e) @@ -1,5 +1,5 @@ -<div ng-controller="TableSearchController"> - <h1 class="page-header">Search</h1> +<div class="container-fluid" ng-controller="TableSearchController"> + <h1>Search</h1> <div class="alert alert-warning" ng-show="message.length > 0"> <p>{{message}}</p> </div> Modified: app/views/top.html (+2 -2) =================================================================== --- app/views/top.html 2014-10-27 15:49:51 +0900 (9d2dab1) +++ app/views/top.html 2014-10-27 16:08:47 +0900 (90856cb) @@ -1,5 +1,5 @@ -<div class="container"> - <h2>Tables</h2> +<div class="container-fluid" ng-controller="TopController"> + <h1>Tables</h1> <div class="list-group"> <a ng-repeat="table in tables track by $index" class="list-group-item" -------------- next part -------------- HTML����������������������������...Télécharger
