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

HW12-Zixuan Xu #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+279 −52
Open

HW12-Zixuan Xu #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae465ed
HW12
zxuanxu Apr 19, 2019
01ebf29
HW12-Zixuan Xu
zxuanxu Apr 20, 2019
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added lab/.DS_Store
View file
Open in desktop
Binary file not shown.
151 changes: 136 additions & 15 deletions lab/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
body {
padding: 0;
overflow: hidden;
/* overflow: hidden; */
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
}

.map {
position: absolute;
right: 0px;
left: 340px;
left: 650px;
height: 100%;
top: 0;
}

.sidebar {
position: absolute;
left: 0px;
width: 340px;
width: 650px;
height: 100%;
top: 0;
bottom: 0;
overflow-y: auto;
padding: 20px;
padding-bottom: 60px;
}

.item {
Expand All @@ -35,16 +30,15 @@ body {
.item-heading {
font-size: 18px;
margin-top: 0;
margin-bottom: 0;
font-weight: bold;
}

.sort {
position: fixed;
position: absolute;
bottom: 0;
left: 0;
width: 340px;
padding-bottom: 20px;
background-color: #fff;
padding: 20px;
}

.sort-option {
Expand All @@ -57,18 +51,145 @@ body {

.sidebar nav.navbar-default {
border: 0;
top: 0;
border-radius: 0;
background-color: #fff;
border-bottom: 1px solid #eee;
margin: -14px -20px 20px;
padding: 10px 20px 15px;
margin-bottom: 20px;
margin-top: 10px;
padding-bottom: 15px;
}

.navbar {
position: relative;
padding-left: 0;
padding-right: 0;
}

.navbar-brand {
font-size: 14px;
font-weight: bold;
}

.navbar-primary {
bottom: 0px;
left: 0px;
position: absolute;
top: 51px;
width:270px;
z-index: 8;
overflow: hidden;
-webkit-transition: all 0.1s ease-in-out;
-moz-transition: all 0.1s ease-in-out;
transition: all 0.1s ease-in-out;
}

.navbar-primary.collapsed {
width: 60px;
}

.navbar-primary.collapsed .glyphicon {
font-size: 22px;
}

.navbar-primary.collapsed .nav-label {
display: none;
}

.navbar-primary-menu,
.navbar-primary-menu li {
margin:0;
padding:0;
list-style: none;
}

.navbar-primary-menu li a {
display: block;
padding: 10px 18px;
text-align: left;
border-bottom:solid 1px #444;
color: #ccc;
}

.navbar-primary-menu li a:hover {
background-color: #000;
text-decoration: none;
color: white;
}

.navbar-primary-menu li a .glyphicon {
margin-right: 6px;
}

.navbar-primary-menu li a:hover .glyphicon {
color: orchid;
}

.topright-button {
position: absolute;
right: 0;
}

.btn-info {
border-radius: 0;
border-color: white;
}

.btn-info:hover {
background-color: #17a2b8;
}

.container-fluid.clearfix {
padding: 0;
}

.col {
height: -webkit-fill-available;
}

.row {
height: 100%;
}

.dropdown-item {
text-align: right;
}

.fa-search {
color: #007BBE;
}

.btn-outline-secondary {
border-color: lightgray;
}

.form-control {
border-radius: 0;
}

#side-list {
background-color: #384B58;
}

.modal-title {
font-size: 16px;
}

.modal-body {
border: 20px;
}

#modal-note {
background-color: red;
color: white;
padding:10px;
width:200px;
}

#modal-name {
font-size: 30px;
font-weight: bold;
}
/* =============
Media Queries
============= */
Expand Down
Loading