Skip to content
Snippets Groups Projects
Commit 88db55b3 authored by Kyle Doherty's avatar Kyle Doherty
Browse files

more responsive updates

parent bace64b2
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 115 deletions
resources/frontend_client/app/css/core/flex.css
+ 13
− 0
View file @ 88db55b3
......@@ -27,3 +27,16 @@
.flex-align-right {
margin-left: auto;
}
.layout-centered {
align-items: center;
justify-content: center;
}
.flex-column {
flex-direction: column;
}
.flex-row {
flex-direction: row;
}
resources/frontend_client/app/css/core/layout.css
+ 1
− 20
View file @ 88db55b3
......@@ -37,13 +37,7 @@
.block { display: block; }
.inline-block { display: inline-block; }
.table {
display: table;
}
.table-cell {
display: table-cell;
}
.table { display: table; }
.full {
width: 100%;
......@@ -71,16 +65,3 @@
.right { right: 0; }
.bottom { bottom: 0; }
.left { left: 0; }
.layout-centered {
align-items: center;
justify-content: center;
}
.flex-column {
flex-direction: column;
}
.flex-row {
flex-direction: row;
}
resources/frontend_client/app/css/home.css
+ 2
− 4
View file @ 88db55b3
......@@ -2,9 +2,11 @@
padding-top: 2rem;
padding-bottom: 2rem;
}
.Greeting-title,
.Greeting-subtitle {
font-weight: 100;
font-size: 1.9375em;
}
@media screen and (--breakpoint-min-xl) {
......@@ -12,10 +14,6 @@
padding-top: 6em;
padding-bottom: 6em;
}
.Greeting-title,
.Greeting-subtitle {
font-size: 1.9375em;
}
}
.Greeting-subtitle {
......
resources/frontend_client/app/dashboard/partials/dash_list.html deleted 100644 → 0
+ 0
− 35
View file @ bace64b2
<div class="wrapper">
<div class="col col-sm-12">
<div class="py2">
<a class="Button Button--primary float-right my1" href="/dash/create">Create Dashboard</a>
<h2>Dashboards</h2>
</div>
<div class="List">
<div class="List-filters List-section clearfix">
<div class="float-left">
<span class="List-filterLabel float-left">Filter:</span>
<div class="Button-group">
<a class="Button" ng-class="{ 'Button--selected' : filterMode == 'all' }" ng-click="filter('all')">all</a>
<a class="Button" ng-class="{ 'Button--selected' : filterMode == 'mine' }" ng-click="filter('mine')">mine</a>
</div>
</div>
<div class="float-right">
<input class="input" type="text" ng-model="searchFilter" placeholder="Search...">
</div>
</div>
<ul>
<li class="List-item List-section" ng-repeat="dash in dashboards | filter:searchFilter">
<div class="float-right my2">
<span class="List-timeStamp mx3 inline-block">{{dash.updated_at | date : 'MMM d, y, hh:mm a'}}</span>
<a class="Button Button--remove" href="#" ng-click="deleteDash(dash.id)" delete-confirm>Delete</a>
</div>
<h3>
<a class="link text-normal" href="/dash/{{dash.id}}">{{dash.name}}</a>
</h3>
<p>{{dash.description}}</p>
<span class="text-grey-3">Created by: {{dash.creator.common_name}}</span>
</li>
</ul>
</div>
</div>
</div>
resources/frontend_client/app/dashboard/partials/dash_list_for_card.html deleted 100644 → 0
+ 0
− 29
View file @ bace64b2
<div class="wrapper">
<div class="py2 border-bottom">
<h2>Dashboards for {{cardName}}</h2>
</div>
<div class="List">
<div class="List-filters List-section clearfix">
<div class="float-left">
<span class="List-filterLabel float-left">Filter:</span>
<div class="Button-group">
<a class="Button" ng-click="filter('all')">all</a>
<a class="Button" ng-click="filter('mine')">mine</a>
</div>
</div>
<div class="float-right">
<input class="input" type="text" ng-model="searchFilter" placeholder="Search...">
</div>
</div>
<ul>
<li class="List-item List-section" ng-repeat="dash in dashboards | filter:searchFilter">
<span class="List-timeStamp float-right">{{dash.updated_at | date : 'MMM d, y, hh:mm a'}}</span>
<h3>
<a class="link text-normal" href="/dash/{{dash.id}}">{{dash.name}}</a>
</h3>
<p>{{dash.description}}</p>
{{dash.creator.common_name}}
</li>
</ul>
</div>
</div>
resources/frontend_client/app/home/home.html
+ 11
− 7
View file @ 88db55b3
<div class="Home full-height" ng-controller="Home">
<div class="bg-brand text-white border-bottom">
<div class="Grid align-center wrapper">
<div class="Greeting Grid-cell" ng-controller="HomeGreeting">
<div class="Greeting-title">{{greeting}}</div>
<div class="Greeting-subtitle">{{subheading}}</div>
<div class="Grid Grid--full Grid--gutters large-Grid--1of2 align-center wrapper">
<div class="Grid-cell" ng-controller="HomeGreeting">
<div class="Greeting">
<div class="Greeting-title">{{greeting}}</div>
<div class="Greeting-subtitle">{{subheading}}</div>
</div>
</div>
<div class="Grid-cell flex-align-right">
<a class="HomeTab Grid-cell" ng-class="{'HomeTab--active' : currentView === 'data' }" ng-click="currentView = 'data'">I have a new question</a>
<a class="HomeTab Grid-cell" ng-class="{'HomeTab--active' : currentView === 'questions'}" ng-click="currentView = 'questions'">An existing question</a>
<div class="Grid-cell">
<div class="flex-align-right">
<a class="HomeTab inline-block" ng-class="{'HomeTab--active' : currentView === 'data' }" ng-click="currentView = 'data'">I have a new question</a>
<a class="HomeTab inline-block" ng-class="{'HomeTab--active' : currentView === 'questions'}" ng-click="currentView = 'questions'">An existing question</a>
</div>
</div>
</div>
</div>
......
resources/frontend_client/app/user/partials/edit_current_user.html
+ 24
− 20
View file @ 88db55b3
<div class="border-bottom">
<div class="wrapper">
<h2>Account settings</h2>
</div>
</div>
<div class="wrapper">
<div class="my3 col col-md-12 clearfix">
<div class="Button-group col col-md-4 offset-md-4">
<div class="row">
<a class="Button col col-md-6 text-centered"
ng-click="setTabFocus('details')"
ng-class="{ 'Button--selected' : tab_focus == 'details' }">
User Details
</a>
<a class="Button col col-md-6 text-centered"
ng-click="setTabFocus('password')"
ng-class="{ 'Button--selected' : tab_focus == 'password' }">
Password
</a>
<div class="Grid">
<div class="Grid-cell">
<div ng-if="tab_focus == 'details'">
<ng-include src="'/app/user/partials/user_edit.html'"></ng-include>
</div>
<div class="clearfix" ng-if="tab_focus == 'password'">
<ng-include src="'/app/user/partials/password_edit.html'"></ng-include>
</div>
</div>
</div>
<div class="Grid-cell">
<a class="rouded p4 block"
ng-click="setTabFocus('details')"
ng-class="{ 'bg-brand text-white' : tab_focus == 'details' }">
User Details
</a>
<div class="clearfix" ng-if="tab_focus == 'details'">
<ng-include src="'/app/user/partials/user_edit.html'"></ng-include>
</div>
<div class="clearfix" ng-if="tab_focus == 'password'">
<ng-include src="'/app/user/partials/password_edit.html'"></ng-include>
<a class="rounded p4 block"
ng-click="setTabFocus('password')"
ng-class="{ 'bg-brand text-white' : tab_focus == 'password' }">
Password
</a>
</div>
</div>
</div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment