Skip to content
This repository has been archived by the owner on Nov 6, 2022. It is now read-only.

Commit

Permalink
Merge pull request #157 from trailimage/develop
Browse files Browse the repository at this point in the history
slight design updates
  • Loading branch information
Jason-Abbott authored Sep 16, 2019
2 parents 6b2de58 + af4b790 commit 053e9a8
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 31 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
## 4.3.0

- Adjust design for more white space
- Update jQuery version

## 4.2.1

- Update dependencies and copyright date
- Update dependencies and copyright date

## 4.2.0

Expand Down
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@types/jquery": "^3.3.0",
"@types/mapbox-gl": "^0.45.0",
"@types/node-fetch": "^2.1.0",
"@types/request": "^2.47.0",
"@types/request": "^2.48.3",
"@types/twitter": "1.7.0",
"@types/uglify-js": "^3.0.0",
"gulp": "^4.0.0",
Expand All @@ -55,11 +55,11 @@
"gulp-typescript": "^5.0.0",
"gulp-uglify": "^3.0.0",
"js-yaml": ">=3.13.1",
"merge2": "^1.2.0",
"merge2": "^1.3.0",
"nodemon": "^1.19.2",
"through2": "^3.0.0",
"ts-node": "^8.0.0",
"typescript": "^3.6.2",
"ts-node": "^8.4.1",
"typescript": "^3.6.3",
"vinyl": "^2.2.0"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion public/css/ti.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/less/category-page.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

header.page.category-header #top-bar {
// custom height
height: 65px;
height: 75px;

h1,
h4 {
Expand All @@ -22,7 +22,7 @@ header.page.category-header #top-bar {

// subtitle
h4 {
margin: 3px 0 0 8px;
margin: 7px 0 0 8px;
color: rgba(255, 255, 255, 0.1);
text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
font-size: 14px;
Expand Down Expand Up @@ -94,12 +94,12 @@ div.category {
background-color: #fff;
margin-top: 20px;
border-top: 1px solid @lightTrimColor;
padding: 6px 7px 4px 6px;
padding: 13px 7px 10px 15px;
.drop-shadow(0, -2px, 6px, 0.1);

.mode-icon {
float: right;
margin: 1px 15px 0 0;
margin: 1px 10px 0 0;
}

ul.info {
Expand Down Expand Up @@ -146,7 +146,7 @@ div.category {
}

p.summary {
margin: 15px 20px 0;
margin: 25px 30px 0;
font-family: @serifFont;
font-size: 16px;
line-height: 1.2em;
Expand Down
12 changes: 6 additions & 6 deletions src/less/post-page.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import 'elements';
@import 'settings';

@postHeaderHeight: @headerHeight + 15;
@postHeaderHeight: @headerHeight + 10;
@mobileButtonSize: 30px;
@mobileButtonMargin: 5px;
@mobileButtonColor: #fff;
Expand Down Expand Up @@ -52,12 +52,12 @@ header.page.post-header {
}

#post-date {
top: 40px;
right: 63px;
top: @postHeaderHeight - 20;
right: 80px;
z-index: 500;
font-weight: bold;
font-size: 14px;
color: lighten(@boldColor, 10%);
color: @boldColor;
}

.video-link {
Expand Down Expand Up @@ -96,7 +96,7 @@ header.page.post-header {
font-size: 16px;
text-align: justify;
margin: 13px 35px 0;
padding: 1.2em 2em 1em;
padding: 1.6em 2em 1.2em;
text-rendering: optimizeLegibility;

p {
Expand Down Expand Up @@ -325,7 +325,7 @@ div.previous {
}

nav.tag-wrapper {
@height: 22px;
@height: 28px;
@mobileHeight: @height + 14;

width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/less/settings.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@serifFont: 'Lora', Georgia, Times;
@headerFont: 'Oswald', Impact, Arial, sans-serif;
@fontSize: 17px;
@headerHeight: 55px;
@headerHeight: 65px;
@imageWidth: 1034px; /* 1034px includes borders */
@contentWidth: 650px;
@boldColor: #524948;
Expand Down
2 changes: 1 addition & 1 deletion views/partials/head-files.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<link rel="apple-touch-icon" sizes="114x114" href="/img/launch-icon-114x114.png" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href='/css/ti.css' rel='stylesheet' type='text/css' /> {{! update admin.hbs and mapbox.hbs to match }}
<script src='//ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js' type='text/javascript' defer></script> {{! other scripts are loaded dynamically by responsive.js }}
<script src='//ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js' type='text/javascript' defer></script> {{! other scripts are loaded dynamically by responsive.js }}
<script src='/js/responsive.js' type='text/javascript' defer></script>

0 comments on commit 053e9a8

Please sign in to comment.