Skip to content

Commit

Permalink
Merge pull request #97 from rit-sse/design-changes
Browse files Browse the repository at this point in the history
Browse page styling and hello text
  • Loading branch information
khanny17 authored May 5, 2017
2 parents ff4d69b + 08f308f commit 30cd30a
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 31 deletions.
59 changes: 32 additions & 27 deletions public/sass/browse.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
.browse {
.panel {
margin: 0;
}
overflow-x: hidden;

.panel-body {
padding: 15px 0;
}
.panel {
margin: 0;
}

.panel-heading {
cursor: pointer;
p {
display: inline;
}
}
.form-group {
display: inline-block;
vertical-align: top;
min-width: 200px;
}
.filters {
border-bottom: 1px solid gray;
margin-bottom: 15px;
}
.btn {
padding: 2px 5px;
box-shadow: none;
}
.load-btn {
float: right;
.panel-body {
padding: 15px 0;
}

.panel-heading {
cursor: pointer;
p {
display: inline;
}
}
.form-group {
display: inline-block;
vertical-align: top;
min-width: 200px;
}
.filters {
border-bottom: 1px solid gray;
margin-bottom: 15px;
}
.btn {
padding: 2px 5px;
box-shadow: none;
}
.load-btn {
float: right;
}
.plan-rows {
margin-bottom: 10px;
}
}
2 changes: 1 addition & 1 deletion public/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
margin-top: -5px;
padding: 10px;
font-size: 24px;
}
}
2 changes: 1 addition & 1 deletion public/views/browse.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1>Public Plans</h1>
</div>
</div>
</div>
<div class="row">
<div class="row plan-rows">
<div class="col-md-10 col-md-offset-1">
<div class="panel panel-default" ng-repeat="plan in plans | planFilter:filters"
ng-class="{ 'panel-primary': $parent.selectedPlan === plan }">
Expand Down
4 changes: 2 additions & 2 deletions public/views/empty-view.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="container" id="empty-view">
<h3>To get started, click "Add Year" below</h3>
<h3>You could also try clicking <b>Browse</b> and selecting someone else's shared plan</h3>
<h3>To get started, click "Add Year" below.</h3>
<h3>If you log in, you can <a href="/browse"><b>Browse</b></a> and select someone else's shared plan.</h3>
</div>

0 comments on commit 30cd30a

Please sign in to comment.