Skip to content
This repository was archived by the owner on Dec 3, 2019. It is now read-only.

Steve changed the buttons style, finished the homework and submitted … #26

Open
MHDGhanemBalhawan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Steve changed the buttons style, finished the homework and submitted … #26

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
636c866
Steve changed the buttons style, finished the homework and submitted …
MHDGhanemBalhawan Apr 20, 2018
f2c4863
Steve amend the homework and done the last extra large button for rev…
MHDGhanemBalhawan Apr 20, 2018
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
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<title>CSS skin</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link type="text/css" rel="stylesheet" href="skin.css">
<link type="text/css" rel="stylesheet" href="skin.min.css">
</head>
<body>
<div>
Expand All @@ -19,7 +19,7 @@ <h3>Default Button</h3>
<p>On hover, the text in the button should <strong>not</strong> be underlined.</p>
<div class="demo">
<p>It currently looks like this: </p>
<button class="btn">Button</button>
<button class="btn button--default">Button</button>
</div>
<div class="expected">
<p>It should eventually look like this: </p>
Expand Down
92 changes: 79 additions & 13 deletions skin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,79 @@
.highlight {
background-color: #ddd;
}

button.btn {
border-radius: 3px;
border-style: solid;
border-width: 1px;
font-weight: normal;
line-height: 1.15;
text-align: center;
vertical-align: middle;
}
.btn--extra-large {
width: 351px;
}

.button {
color: #224C8B;
background-color: #ffffff;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
}

.button:hover {
cursor: default;
}

.button--default {
color: #224C8B;
background-color: #ffffff;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
}

.button--default:hover {
cursor: default;
}

.btn--primary {
color: #ffffff;
background-color: #224C8B;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
}

.btn--primary:hover {
cursor: default;
}

.btn--secondary {
color: #B8B8B8;
background-color: #fbfbfb;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
}

.btn--secondary:hover {
cursor: default;
}

.btn--large {
color: #224C8B;
background-color: #ffffff;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
width: 270px;
padding: 25px;
}

.btn--large:hover {
cursor: default;
}

.btn--extra-large {
padding: 25px;
}
1 change: 1 addition & 0 deletions skin.min.css
View file
Open in desktop

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

58 changes: 58 additions & 0 deletions skin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
$bright-orange: #ffcc66;
$orange: #d58512;
$red: #cc0000;
$white: #ffffff;
$thickness: 4px;
$background-color: #333;
$blue: #224C8B;
$lightgray: rgb(251, 251, 251);
$gray: #B8B8B8;
$width-large: 270px;
$width-extra-large: $width-large * 1.30;
$padding-large:25px;

@mixin btn ($color, $background-color, $border-color) {
color: $color;
background-color: $background-color;
width: 175px;
padding: 15px 5px;
border-radius: 0.3rem;
font-size: 1rem;
border: 1px solid lightgray;
&:hover{
cursor: default;
}

}
%width-large {
width: $width-large;

}
%padding-large {
padding: $padding-large;
}
%width-extra-large {
width: $width-extra-large;
}

.button {
@include btn($blue, $white, $gray);
}
.button--default {
@include btn($blue, $white, $gray)
}
.btn--primary {
@include btn($white, $blue, $blue)
}
.btn--secondary {
@include btn($gray,$lightgray, $gray)
}
.btn--large {
@include btn($blue, $white, $gray);
width: $width-large;
padding: $padding-large;
}
.btn--extra-large {
@extend %width-extra-large;
padding: $padding-large;
}