-
Notifications
You must be signed in to change notification settings - Fork 3
Styling Tweak #56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Spazcool
wants to merge
31
commits into
master
Choose a base branch
from
styling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Styling Tweak #56
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
8e8cfc8
ADD: link to item page on item img
Spazcool 92b069f
REMOVE: forced upper & lower styling for item card titles
Spazcool e57e4c2
REMOVE: bootstrap nesting & extra margin around item cards
Spazcool 5fc9303
ADD: conditional img link for item cards
Spazcool 3161d30
REMOVE: bootstrap nesting & margin from item page divs
Spazcool 7bc3d80
REMOVE: unused CSS rules
Spazcool 30987d5
REMOVE: more unused CSS rules
Spazcool b28becc
TWEAK: title vertical centering
Spazcool 14aa0a1
TWEAK: move inline styling to CSS file
Spazcool 518c830
TWEAK: v-align title again
Spazcool 42ee28a
REMOVE: unused img
Spazcool e80ab30
FIX: item img size increase, ADD: wrench.png for broken items
Spazcool dea4899
REMOVE: temp CSS classes, TWEAK: img sizes
Spazcool 472ffc3
FIX: consistent padding & margins
Spazcool 7fa1991
ADD: background color
Spazcool 2e27415
FIX: shrunk & centered wrench icon
Spazcool 0b97e59
FIX: similar items imgs align left
Spazcool 650d060
FIX: no more round edge on imgs
Spazcool 8dbbadc
FIX: lighter background color
Spazcool 56d06f0
FIX: breadcrumb padding
Spazcool 97bea3b
FIX: similar items aligned better
Spazcool 212a390
ADD: flex, REMOVE: bootstrap from itemCard
Spazcool c067342
REMOVE: JS style methods, ADD: CSS rules instead
Spazcool 7f13d77
MODIFY: itemImgInfo styling to matche itemCard style
Spazcool 5d0612b
MODIFY: recent styling, matches itemCard
Spazcool dba57cf
MODIFY: notFound styling matches itemCard
Spazcool a036d1a
REMOVE: JS styling methods from qrList
Spazcool b23af9d
REMOVE: bootstrap and nesting from qrList
Spazcool 47aac90
FIX: title style to match itemCard, REMOVE: dead code from itemCard
Spazcool c26294a
FIX: CSS rules for card and titleCard classes
Spazcool 07ef078
REMOVE: grey background from cards
Spazcool File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
File renamed without changes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<% include ./partials/header %> | ||
<div class="resultContainer container"> | ||
<div class="col-xs-12"><% include ./partials/itemCards %></div> | ||
<div class="col-xs-12"><% include ./partials/itemImgInfo %></div> | ||
<div class="resultContainer"> | ||
<% include ./partials/itemCards %> | ||
<% include ./partials/itemImgInfo %> | ||
</div> | ||
<% include ./partials/footer %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,9 @@ | ||
<% include ./partials/header %> | ||
|
||
<img class="col-xs-12 col-lg-4 col-lg-offset-4" src="/emoji.png" alt="" /> | ||
<article style='margin-top:2em'class="col-xs-12 col-lg-4 col-lg-offset-4"> | ||
<center> | ||
<img width="50%" src="/frown.png" alt="frown" /> | ||
</center> | ||
<article class="subCard"> | ||
<p>Sorry, item not found with the id:</p> | ||
<p> | ||
<strong><%= id %></strong> | ||
</p> | ||
<strong><%= id %></strong> | ||
</article> | ||
|
||
<% include ./partials/footer %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,43 @@ | ||
<div class="col-xs-12"> | ||
<span> <a href="/search?floor=<%- floor %>"> <%- floor.toLowerCase() %> </a></span> > | ||
<span> <a href="/search?floor=<%- floor %>&room=<%- room %>"> <%- room.toLowerCase() %> </a></span> > | ||
<span> <a href="/search?floor=<%- floor %>&room=<%- room %>&location=<%- location %>"> <%- location.toLowerCase() %> </a></span> > | ||
<span> <a href="/search?fixture=<%- fixture %>"> <%- fixture.toLowerCase() %> </a></span> | ||
<div class="breadcrumbs"> | ||
<span> <a href="/search?floor=<%- floor %>"> <%- floor %> </a></span> > | ||
<span> <a href="/search?floor=<%- floor %>&room=<%- room %>"> <%- room %> </a></span> > | ||
<span> <a href="/search?floor=<%- floor %>&room=<%- room %>&location=<%- location %>"> <%- location %> </a></span> > | ||
<span> <a href="/search?fixture=<%- fixture %>"> <%- fixture %> </a></span> | ||
</div> | ||
<% if (uuid) { %> | ||
<div class="well col-xs-12"> | ||
<div class="card titleCard"> | ||
<% } else { %> | ||
<div class="well faded col-xs-12"> | ||
<div class="card titleCard faded"> | ||
<% } %> | ||
<div class="col-xs-2"> | ||
<div class="image"> | ||
<% if (picture === undefined || picture === '') { %> | ||
<img class="itemImg" src="noImg.png" /> | ||
<% if (uuid) { %> | ||
<a href="/<%- uuid %>"> <img class="itemImg" src="noImg.png" /> </a> | ||
<% } else { %> | ||
<img class="itemImg" src="noImg.png" /> | ||
<% } %> | ||
<% }else{ %> | ||
<img class="itemImg" src=" <%- picture %> " /> | ||
<%}%> | ||
<% if (uuid) { %> | ||
<a href="/<%- uuid %>"><img class="itemImg" src=" <%- picture %> " /> </a> | ||
<% } else { %> | ||
<img class="itemImg" src=" <%- picture %> " /> | ||
<% } %> | ||
<% } %> | ||
</div> | ||
<div class="itemTitle col-xs-8"> | ||
<div class="itemTitle"> | ||
<% if (uuid) { %> | ||
<h4> <a href="/<%- uuid %>"> <%- fixture.toUpperCase().bold() %> </a> </h4> | ||
<div class="center"> | ||
<a href="/<%- uuid %>"> <%- fixture %> </a> | ||
<% } else { %> | ||
<h4> <%- fixture.toUpperCase().bold() %> </h4> | ||
<div class="center"> | ||
<%- fixture %> | ||
<% } %> | ||
<span> <%- model.toLowerCase().italics() %> </span> | ||
<div class="subTitle"> <%- model %> </div> | ||
</div> | ||
</div> | ||
<div class="itemImg col-xs-2"> | ||
<div class="image right"> | ||
<% if (status === 'broken') { %> | ||
<span class="glyphicon glyphicon-wrench" title="Status: <%- status %>" alt="<%- status %>" style="color:red"></span> | ||
<%}%> | ||
<img class="status" title="Status: <%- status %>" alt="<%- status %>" src="wrench.png" /> | ||
<% } %> | ||
</div> | ||
</div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,18 @@ | ||
<% include ./partials/header %> | ||
<div class="col-xs-12"> | ||
<% for ( var i = 0; i < matches.length; i++) {%> | ||
<div class="stickers col-xs-3"> | ||
<div class="col-xs-12"> | ||
<%- matches[i].floor.toLowerCase() %> > | ||
<%- matches[i].room.toLowerCase() %> > | ||
<%- matches[i].location.toLowerCase() %> > | ||
<%- matches[i].fixture.toLowerCase() %> | ||
</div> | ||
<div class="col-xs-12"> | ||
<div class="resultContainer"> | ||
<center> | ||
<% for ( var i = 0; i < matches.length; i++) {%> | ||
<div class="sticker"> | ||
<div class="breadcrumbs"> | ||
<%- matches[i].floor %> > | ||
<%- matches[i].room %> > | ||
<%- matches[i].location %> > | ||
<%- matches[i].fixture %> | ||
</div> | ||
<%- matches[i].qr %> | ||
<%- matches[i].uuid %> | ||
</div> | ||
<div class="col-xs-12"> | ||
<center> | ||
<%- matches[i].uuid %> | ||
</center> | ||
</div> | ||
</div> | ||
<% } %> | ||
<% } %> | ||
</center> | ||
</div> | ||
<% include ./partials/footer %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<% include ./partials/header %> | ||
<div class="resultContainer col-xs-12"> | ||
<h1>Recently scanned QR code</h1> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why so picky about custom styling? |
||
<article class="col-xs-12"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. what does "sub" means? |
||
<div class="resultContainer"> | ||
<h2 style="padding: 5px">Recently scanned QR codes</h2> | ||
<article class="subCard"> | ||
<ul class='recent-list'> | ||
<% for(var i = 0; i <allScans.length; i++){%> | ||
<% if(allScans[i].fixture) { %> | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we still need span?