Skip to content

Commit

Permalink
Merge pull request skylines-project#693 from Turbo87/table-styling
Browse files Browse the repository at this point in the history
Improve table styling and refactor bootstrap styles
  • Loading branch information
Turbo87 authored Sep 4, 2017
2 parents fe554cb + 5e92dee commit 5b65189
Show file tree
Hide file tree
Showing 20 changed files with 223 additions and 261 deletions.
74 changes: 38 additions & 36 deletions ember/app/styles/_about.scss
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
#about .social-buttons .btn-group {
float: right;
}

#about .social-buttons .btn {
width: 40px;
}

#about h2 {
font-size: 22px;
}

#about h2 .fa {
width: 1.2em;
text-align: center;
}

#about h2 a {
color: inherit;
text-decoration: none;
}

#about h2 a:hover {
color: #666;
}

#about h2 small {
font-size: 13px;
}

#about p {
text-align: justify;
}

#about .banner div {
padding: 0;
#about {
.social-buttons .btn-group {
float: right;
}

.social-buttons .btn {
width: 40px;
}

h2 {
font-size: 22px;

.fa {
width: 1.2em;
text-align: center;
}

a {
color: inherit;
text-decoration: none;

&:hover {
color: #666;
}
}

small {
font-size: 13px;
}
}

p {
text-align: justify;
}

.banner div {
padding: 0;
}
}
20 changes: 20 additions & 0 deletions ember/app/styles/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
$headings-font-weight: 700;
$zindex-popover: 5000;
$zindex-tooltip: 6000;
$zindex-navbar-fixed: 2000;
$zindex-modal-background: 2010;
$zindex-modal: 2020;

@import 'ember-bootstrap/bootstrap';

@import 'bootstrap/bootstrap-theme-skylines';
@import 'bootstrap/bootstrap-badges';
@import 'bootstrap/bootstrap-vertical-tabs';
@import 'bootstrap/bootstrap-datetimepicker';

@import "bootstrap/modals";
@import "bootstrap/navbar";
@import "bootstrap/page-header";
@import "bootstrap/panel";
@import "bootstrap/tables";
11 changes: 11 additions & 0 deletions ember/app/styles/_footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.footer {
/* center align it with the container */
text-align: center;
margin-top: 5px;
font-size: 85%;

a {
color: #333;
text-decoration: none;
}
}
19 changes: 19 additions & 0 deletions ember/app/styles/_form-login.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.form-login {
min-width: 300px;
padding: 0 20px;
margin-bottom: inherit;


> div, > button {
margin: 15px 0;
}

hr {
margin: 8px 0;
}

a {
padding-left: 0;
padding-right: 0;
}
}
26 changes: 0 additions & 26 deletions ember/app/styles/_login-dropdown.scss

This file was deleted.

11 changes: 0 additions & 11 deletions ember/app/styles/_modals.scss

This file was deleted.

46 changes: 0 additions & 46 deletions ember/app/styles/_panel.scss

This file was deleted.

11 changes: 0 additions & 11 deletions ember/app/styles/_search.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
.navbar-search input {
color: #bbb;
background-color: #626262;
border: 1px solid #333;
}

.navbar-search input:focus {
color: #666;
background-color: white;
}

.search-results .column-icon {
width: 1px;
text-align: center;
Expand Down
16 changes: 3 additions & 13 deletions ember/app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
@import '_power-select';

$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
$headings-font-weight: 700;
$zindex-tooltip: 6000;
$zindex-navbar-fixed: 2000;
@import 'bootstrap';

@import 'ember-bootstrap/bootstrap';

@import 'bootstrap-theme-skylines';
@import 'bootstrap-badges';
@import 'bootstrap-vertical-tabs';
@import 'bootstrap-datetimepicker';
@import 'panel';
@import 'follower-panel';
@import 'tables';
@import 'login-dropdown';
@import 'form-login';
@import 'about';
@import 'search';
@import 'events';
Expand All @@ -23,9 +13,9 @@ $zindex-navbar-fixed: 2000;
@import 'wingman';
@import 'ol3-sidebar';
@import 'flags';
@import 'modals';
@import 'spinner';
@import 'loading-indicator';
@import 'footer';

@import 'ol-GraphicLayerSwitcher-v3';
@import 'ol-PlayButton';
Expand Down
File renamed without changes.
Loading

0 comments on commit 5b65189

Please sign in to comment.