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.

Sign up for GitHub

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

Jump to bottom

Tidy up index page a little #30

Merged
merged 20 commits into from
Mar 22, 2017
Merged

Tidy up index page a little #30

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2191287
make horizontal scrolling work
Brookke Mar 20, 2017
c9c15d7
Add mobile button
Brookke Mar 20, 2017
3a0a142
Use cards for podcasts
Brookke Mar 20, 2017
8da3501
Change mobile font size, make listen button bigger
Brookke Mar 20, 2017
7fecd12
Use block button for mobile
Brookke Mar 20, 2017
81c6992
add breakpoints for mobile to podcasts and videos
Brookke Mar 20, 2017
a4b8c53
rubber band scrolling on horizontal scroll
Brookke Mar 20, 2017
cfbaf19
make columns a little smaller for youtube
Brookke Mar 20, 2017
f93ea70
make banner match width of current and next
Brookke Mar 20, 2017
b4363a4
Merge branch 'development' into brooke-index-page
Brookke Mar 21, 2017
a69c74f
Merge branch 'development' into brooke-index-page
Brookke Mar 21, 2017
1bad747
use spaces for indentation
Brookke Mar 21, 2017
05aba0f
Make send button take up 100% width
Brookke Mar 21, 2017
6b5f12b
improve buttons
Brookke Mar 21, 2017
f341e1c
Merge branch 'development' into brooke-index-page
Brookke Mar 21, 2017
14bdef1
Use backgrounds on index page, add container padding
Brookke Mar 21, 2017
78c183a
make css more specific to podcast cards only
Brookke Mar 21, 2017
24103b9
Update date ury started to include the legal date
Brookke Mar 22, 2017
09f1bbe
Merge branch 'development' into brooke-index-page
Brookke Mar 22, 2017
ef37b9b
Use text-center class rather than inline css
Brookke Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions sass/base/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
border: 2px solid #FFFFFF;

&:hover {
background: #FFFFFF;
color: $blue;
background: #FFFFFF;
color: $blue;
border: 2px solid #FFFFFF;
}
}

Expand All @@ -23,8 +24,11 @@
border: 2px solid #FFFFFF;

&:hover {
background: #FFFFFF;
color: $red;
background: #FFFFFF;
color: $red;
}
}
&.btn-square {
border-radius: 0;
}
}
11 changes: 7 additions & 4 deletions sass/elements/_banner.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.banner {
.carousel-inner img {
width:100%;
}
}
.carousel {
width: 100%;
.carousel-inner img {
width:100%;
}
}
}
2 changes: 1 addition & 1 deletion sass/elements/_currentAndNext.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
.current-and-next-next {
background: $current-next-next-bg;
}
.current-and-next-btn {
.listen-btn {
position: absolute;
bottom: 0.5em;
right: 0;
Expand Down
59 changes: 12 additions & 47 deletions sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

html {
font-size: 12px;
font-size: 16px;
}

@include media-breakpoint-up(sm) {
Expand Down Expand Up @@ -88,51 +88,15 @@ footer {
.index-videos {
background: $secondary-color;
color: #fff;
.scroll-right {
background-color: $primary-color;
}

}
.index-uryplayer, .index-videos{
padding-right:0;
.scroll-container {
.scroll-body, .scroll-right {
display: table-cell;
vertical-align: middle;
}
.scroll-body {
white-space: nowrap;
position: relative;
z-index: 1;
[class*="row"] {
overflow-x: scroll;
overflow-y: hidden;
margin-right:-70px;
}
[class*="col"] {
display: inline-block;
float: none; /* Very important */
padding-right:0;
}
[class*="col"]:last-of-type {
margin-right:95px;
}
.thumbnail {
border-color:black;
padding:0;
}
}
.scroll-right {
padding: 0 10px;
width:80px;
font-size: 100px;
font-weight: 900;
color: white;
position: relative;
z-index: 2;
opacity: 0.7;
}
}

/* Scroll horizontal, used for horizontal scrolling rows */
.scroll-horiz {
overflow-x: scroll;
overflow-y: hidden;
flex-wrap: nowrap;
-webkit-overflow-scrolling: touch;
}


Expand All @@ -153,9 +117,6 @@ footer {
white-space: normal;
}
}
.scroll-right {
background-color: $secondary-color;
}
}

/* User page styling. */
Expand Down Expand Up @@ -271,3 +232,7 @@ footer {
.tag {
font-size:0.8em;
}

.card {
color: #555;
}
5 changes: 4 additions & 1 deletion views/elements/current_and_next.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{if .Current}}
<div class="col-4 col-lg-3 col-xl-2 p-0 current-and-next-img">
<img src="/images/show-current.png" alt="" />
<a href="https://ury.org.uk/listen" class="btn btn-red current-and-next-btn mobile-hide" title="Listen Live" onclick="window.open('http://ury.org.uk/live', 'radioplayer', 'height=665,width=380'); return false;">Listen Live</a>
<a href="https://ury.org.uk/listen" class="btn btn-red listen-btn mobile-hide" title="Listen Live" onclick="window.open('http://ury.org.uk/live', 'radioplayer', 'height=665,width=380'); return false;">Listen Live</a>
</div>
<div class="col-8 col-md p-2 pt-3 px-3 p-md-3 p-lg-4 current-and-next-now">
<h2>Now</h2>
Expand All @@ -17,6 +17,9 @@
{{template "current_next" .Next}}
</div>
{{end}}
<div class="col-12 mobile-only p-0">
<a href="https://ury.org.uk/listen" class="btn btn-lg btn-block btn-square btn-red listen-btn-mobile" title="Listen Live" onclick="window.open('http://ury.org.uk/live', 'radioplayer', 'height=665,width=380'); return false;">Listen Live</a>
</div>
</div>

{{end}}
Expand Down
Loading