Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
navbar
  • Loading branch information
tsm15002 committed Jun 30, 2016
1 parent d79f04d commit 18b620d
Show file tree
Hide file tree
Showing 35 changed files with 1,109 additions and 210 deletions.
580 changes: 485 additions & 95 deletions dist/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/app.min.css

Large diffs are not rendered by default.

27 changes: 2 additions & 25 deletions dist/css/base/typography.css
@@ -1,26 +1,3 @@
@font-face {
font-family: 'Gotham';
src: url(../fonts/Gotham-Book.otf);
font-weight: normal;
font-style: normal; }

@font-face {
font-family: 'Gotham';
src: url(../fonts/Gotham-BookItalic.otf);
font-weight: normal;
font-style: italic; }

@font-face {
font-family: 'Gotham';
src: url(../fonts/Gotham-Bold.otf);
font-weight: bold;
font-style: normal; }

@font-face {
font-family: 'Gotham';
src: url(../fonts/Gotham-BoldItalic.otf);
font-weight: bold;
font-style: italic; }

@import 'https://fonts.googleapis.com/css?family=Prompt:300,300i,600,600i';
html {
font-family: 'Gotham'; }
font-family: 'Prompt', sans-serif; }
2 changes: 1 addition & 1 deletion dist/css/base/typography.min.css

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

1 change: 0 additions & 1 deletion dist/js/main.js
Expand Up @@ -201,7 +201,6 @@
});
}
Element.prototype.hasClass = function(_class) {
console.log('hi');
if(this.classList) {

return this.classList.contains(_class);
Expand Down
2 changes: 1 addition & 1 deletion dist/js/main.min.js

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

2 changes: 1 addition & 1 deletion functions.php
Expand Up @@ -34,7 +34,7 @@ class StarterSite extends TimberSite {
$context['foo'] = 'bar';
$context['stuff'] = 'I am a value set in your functions.php file';
$context['notes'] = 'These values are available everytime you call Timber::get_context();';
$context['menu'] = new TimberMenu();
$context['menu'] = new TimberMenu('Main Menu');
$context['site'] = $this;
return $context;
}
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion src/js/uconn.js
Expand Up @@ -117,7 +117,6 @@
});
}
Element.prototype.hasClass = function(_class) {
console.log('hi');
if(this.classList) {

return this.classList.contains(_class);
Expand Down
3 changes: 3 additions & 0 deletions src/scss/base/_global.scss
Expand Up @@ -20,8 +20,11 @@
@import 'elements/subpageLayout';
@import 'elements/footer';

@import 'pages/landing';
@import 'pages/degrees';
@import 'pages/concentrations';
@import 'pages/our-work';
@import 'pages/for-students';
@import 'pages/about-us';
@import 'pages/talk-to-us';
@import 'pages/apply-now';
Expand Down
3 changes: 3 additions & 0 deletions src/scss/base/elements/footer.scss
Expand Up @@ -48,6 +48,7 @@
border-radius:50%;
margin:0.5em;
position:relative;
border-color:white;

&#facebook {
background:url(../img/footer-icons/facebook.png) no-repeat center / cover;
Expand Down Expand Up @@ -75,6 +76,7 @@
color:black;
text-decoration:none;
background-color:white;
border-color:white;
padding:1em 1.5em;
position:relative;

Expand All @@ -90,6 +92,7 @@

&::after {
content:"";
background-color:white;
position:absolute;
top:100%;
left:50%;
Expand Down
19 changes: 6 additions & 13 deletions src/scss/base/pages/concentrations.scss
@@ -1,23 +1,15 @@

.concentrationsContainer {
display:flex !important;
flex-flow:row wrap;
justify-content:center;
align-items:stretch;
}

.concentrationTiles {
display:flex;
flex-flow:row wrap;
justify-content: space-around;
}

.concentrationTile {
width:90vw;
height:50vw;
display:block;
margin:1em 0;
margin:1em 2.5vw;
text-decoration:none;
float:left;
}

$backgrounds: ('2dAnimation', '3dAnimation', 'businessStrategies', 'digitalHumanities', 'gameDesign', 'webDesign');
Expand All @@ -30,9 +22,6 @@ $backgrounds: ('2dAnimation', '3dAnimation', 'businessStrategies', 'digitalHuman
.concentrationTile__inner {
width:100%;
height:100%;
display:flex;
align-items:center;
justify-content:center;
position:relative;
background-color:transparent;
transition:background-color 0.15s $animation-easing-function;
Expand All @@ -44,6 +33,10 @@ $backgrounds: ('2dAnimation', '3dAnimation', 'businessStrategies', 'digitalHuman
}

.concentrationTile__text {
position:absolute;
top:50%;
left:50%;
transform:translate(-50%,-50%);
width:60%;
text-align:center;
color:white;
Expand Down
17 changes: 10 additions & 7 deletions src/scss/base/pages/degrees.scss
@@ -1,12 +1,12 @@
.degreeCards {
display:flex;
flex-flow:column wrap;
align-items:center;
margin:1em 0;
margin:1em auto;
max-width:24em;
overflow-y:hidden;
}

.degreeCard {
display:block;
float:left;
width:100%;
max-width:24em;
margin:0 0 1em;
Expand Down Expand Up @@ -43,6 +43,10 @@
h4 {
font-weight:lighter;
margin:0.5em 0 0;

span {
padding:0 0.4em;
}
}
}

Expand Down Expand Up @@ -74,12 +78,11 @@
margin:4em auto;
box-sizing:border-box;
padding:0.5em;
display:flex;
justify-content:space-between;
flex-flow:row wrap;
overflow-y:hidden;
}

.degreeBanner__btn {
float:left;
box-sizing:border-box;
text-align:center;
display:block;
Expand Down
89 changes: 89 additions & 0 deletions src/scss/base/pages/for-students.scss
@@ -0,0 +1,89 @@


.forStudentsTiles {
margin:2em 0;
overflow-y:hidden;
}


.forStudentsTile {
margin:0;
width:100%;
float:left;
padding:1em;
box-sizing:border-box;
}

.forStudentsTile__inner {
display:block;
width:100%;
max-width:30em;
margin:0 auto;
text-decoration:none;
position:relative;
overflow-y:hidden;

@include extendedBorder(before, -1em, $for-students-color, 2, 100%);

&:hover {
.forStudentsTile__image img {
transform:scale(1.2);
}

.forStudentsTile__caption {
background-color:rgba(0,0,0,0.5);

span {
background-color:$for-students-color;
color:white;
}
}
}

}

.forStudentsTile__image {
width:100%;
height:100%;
overflow:hidden;
img {
width:100%;
vertical-align:bottom;
transform:scale(1.0);
transition:transform 0.2s $animation-easing-function;
}
}

.forStudentsTile__caption {
width:100%;
height:100%;
position:absolute;
top:0;
left:0;
z-index:1;

background-color:transparent;
transition:background-color 0.2s $animation-easing-function;

span {
display:block;

position:absolute;
top:50%;
left:50%;
transform:translate(-50%,-50%);

color:$for-students-color;
font-weight:bold;
background-color:rgba(0,0,0,0.7);
font-size:1em;
text-align:center;

padding:1em 2em;

transition:color 0.2s $animation-easing-function, background-color 0.2s $animation-easing-function;
}
}



0 comments on commit 18b620d

Please sign in to comment.