Skip to content

Alignment #61

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

Open
heathermoses wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Alignment #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df0297d
Updated alignment of next, back buttons and fixed styling
hlm8500 Mar 30, 2020
a605db1
Merge branch 'master' of https://github.com/all-rit/AccessibilityLab2…
hlm8500 Mar 30, 2020
0e30f41
Fixed alignment of reading page
hlm8500 Apr 2, 2020
3962275
About text is now aligned with header.
hlm8500 Apr 2, 2020
5c7c8e4
Fixed spacing between about text and header
hlm8500 Apr 2, 2020
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
2 changes: 1 addition & 1 deletion frontend/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class App extends Component {
>
next
</button>
<footer class="footer">
<footer>
<div class="btn-change">
<Change />
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/assets/stylesheets/pages/CaseStudy.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.study {
width: 960px;
margin: 2rem auto;
font-size: 1.5rem;
text-align: center;
}
.study > h1 {
margin-bottom: 3rem;
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/assets/stylesheets/pages/CaseStudy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.study {
width: 960px;
margin: 2rem auto;
font-size: 1.5rem;

text-align: center;
> h1 {
margin-bottom: 3rem;
}
Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/aboutInformation/aboutInfoStyle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
}

.margin {
margin-left: 200px;
margin-right: 200px;
margin: 2rem auto;
font-size: calc(12px + (18 - 12) * ((100vw - 300px) / (1600 - 300)));
}

Expand Down
16 changes: 11 additions & 5 deletions frontend/src/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ hr.horiz {
.btn-information{
clear:both;
float:right;
margin-bottom: 20px;
}
.btn-change {
font-family: "Montserrat", -apple-system, BlinkMacSystemFont, "Segoe UI",
Expand Down Expand Up @@ -95,17 +96,20 @@ h2{
border-color: #fed136;
color: #404040;
float: right;
margin: 20px;
padding: 8px !important;
}
.back {
background-color: #404040;
border-color: #404040;
color: white;
float: left;
margin: 20px;
padding: 8px !important;
}

.back, .next{
margin-bottom:10px;
}

.hidden {
display: none;
}
Expand All @@ -117,15 +121,17 @@ body {
margin-right: 2%;
}
.row {
display: flex !important;
display: block !important;
justify-content: space-around !important;
margin-top: 50px !important;
margin-bottom: 25px !important;
text-align: left !important;
text-align: center !important;
}
#mainNav .navbar-nav .nav-item .nav-link {
font-size: 100%;
}
#mainNav .navbar-brand {
font-size: 1.94em;
}
.no-margin {
margin: 0 !important;
}