Skip to content
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

Cleaned up CSS and HTML to remove the “new-prototype” class #420

Merged
merged 1 commit into from Mar 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions frontend/app/templates/details-new.html
@@ -1,5 +1,5 @@
<simple-nav></simple-nav>
<main class="school-detail-page new-prototype">
<main class="school-detail-page">
<div class="container-fluid ">
<div class="row hero" style="background-image: url(/media/{{ school.profile.photo }}), url(../img/mural.jpg)"/>
</div>
Expand All @@ -10,9 +10,9 @@ <h1>{{ school.name }}</h1>
<p class="lead">{{ school.school_type }} | {{ school.grades }}</p>
</div>
</div>
<div>
<a class="btn btn-school-website" href="{{ school.profile.website_url | uri }}">Visit the Official School Website</a>
</div>
<div>
<a class="btn btn-school-website" href="{{ school.profile.website_url | uri }}">Visit the Official School Website</a>
</div>
</div>

<nav class="row school-profile-tabs middle-school-tabs-nav">
Expand Down
73 changes: 29 additions & 44 deletions frontend/css/index.css
Expand Up @@ -429,6 +429,9 @@ div#schools-wrapper ul.nav li.active a, div#schools-wrapper ul.nav li a:hover {

/*SCHOOL DETAIL PAGE*/

.school-detail-page {
margin-bottom: 60px;
}
.school-detail-page ol {
padding-left: 20px;
}
Expand All @@ -439,8 +442,19 @@ div#schools-wrapper ul.nav li.active a, div#schools-wrapper ul.nav li a:hover {
.school-detail-page ul li {
padding-bottom: 10px;
}
.school-detail-page {
margin-bottom: 40px;
.school-detail-page .school-profile-tabs ul li {
text-align: center;
text-transform: uppercase;
width: 20%;
padding-bottom: 0;
}
.school-detail-page .nav-pills > li+li {
margin: 0;
}
.school-profile-tabs .nav-pills > li.active > a,
.school-profile-tabs .nav-pills > li > a:hover {
border-radius: 0;
cursor: pointer;
}
.btn-school-website {
font-size: 21px;
Expand Down Expand Up @@ -504,11 +518,9 @@ div.avgline span.avg {
.map-row .angular-leaflet-map {
margin-top: 20px;
}

.overlay {
display: none;
}

.coming-soon .overlay {
opacity: 1;
display: block;
Expand Down Expand Up @@ -547,71 +559,45 @@ div.avgline span.avg {
.coming-soon.teacher-survey .overlay .opacity {
opacity: 0.7;
}


/* NEW PROTOTYPE STYLES */
/* ========================
Once the new school profile page is implemented,
the follwoing styles will have to be refactored to remove .new-prototype class
and integrated with other styles above
=========================== */

.new-prototype.school-detail-page {
margin-bottom: 60px;
}
.new-prototype .container {
.container {
margin-top: 0;
}
.new-prototype .container,
.new-prototype .container-fluid {
.container,
.container-fluid {
position: relative;
}
.new-prototype .hero {
.hero {
height: 350px;
opacity: 0.25;
}
.new-prototype .school-profile-header {
.school-profile-header {
margin-top: -250px;
}
.new-prototype .school-profile-header.middle-school {
.school-profile-header.middle-school {
color: #666;
}
.new-prototype nav.school-profile-tabs {
nav.school-profile-tabs {
background-color: #ffffff;
border-top: 1px solid #666;
border-bottom: 1px solid #666;
}
.new-prototype.school-detail-page .school-profile-tabs ul li {
text-align: center;
text-transform: uppercase;
width: 20%;
padding-bottom: 0;
}
.new-prototype.school-detail-page .nav-pills > li+li {
margin: 0;
}
.school-profile-tabs .nav-pills > li.active > a,
.school-profile-tabs .nav-pills > li > a:hover {
border-radius: 0;
cursor: pointer;
}
.new-prototype .middle-school-tabs-nav .nav-pills > li > a {
.middle-school-tabs-nav .nav-pills > li > a {
color: #666;
}
.new-prototype .middle-school-tabs-nav .nav-pills > li.active > a {
.middle-school-tabs-nav .nav-pills > li.active > a {
background-color: #666;
color: #ffffff;
}
.new-prototype .school-profile-content {
.school-profile-content {
margin-top: 40px;
}
.new-prototype .school-profile-content .row {
.school-profile-content .row {
display: none;
}
.new-prototype .school-profile-content .active {
.school-profile-content .active {
display: block;
}
.new-prototype .force-line-break {
.force-line-break {
/* These are technically the same, but use both */
overflow-wrap: break-word;
word-wrap: break-word;
Expand All @@ -627,5 +613,4 @@ and integrated with other styles above
-moz-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;

}