Skip to content

Commit a31ee8c

Browse files
author
Julia Simplicio
committed
Few more small styling changes and fixes.
1 parent f5b2747 commit a31ee8c

File tree

6 files changed

+73
-11
lines changed

6 files changed

+73
-11
lines changed

app.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</div>
3333

3434
<div class="content-container">
35-
<header class="bb b--light-gray pvm">
35+
<header class="main-header bb b--light-gray pvs">
3636
<div class="center mw8 phm phl-ns">
3737
<h1 class="f3 book dib prm man">ScreenCat</h1>
3838
<div class="fr">
@@ -49,7 +49,7 @@ <h1 class="f3 book dib prm man">ScreenCat</h1>
4949
<a class="share-button tc phs pvs pvm-ns f4 btn w-100 mw-fill mrm">Share Your Screen</a>
5050
</div>
5151
<div class="w-50 left">
52-
<a class="join-button tc phs pvs pvm-ns f4 btn w-100 mw-fill">Join Remote Screen</a>
52+
<a class="join-button tc phs pvs pvm-ns f4 btn w-100 mw-fill mlm">Join Remote Screen</a>
5353
</div>
5454
</div>
5555
</div>
@@ -70,14 +70,14 @@ <h2 class="f4 ttu book">Share</h2>
7070
<div class="join-container dn">
7171
<h2 class="f4 ttu book cl">join</h2>
7272
<div class="cr">
73-
<div class="w-80 left">
74-
<input class="code-paste-input pam brs ba b--light-gray w-100 mw-fill" value="Loading..."></input>
73+
<div class="w-80 left prl">
74+
<input type="text" class="code-paste-input pam brs ba b--light-gray w-100 mw-fill" value="Loading..."></input>
7575
</div>
7676
<div class="w-20 left">
7777
<div class="code-paste-button tc phs pvs pvm-ns f4 btn w-100 mw-fill">Connect</div>
7878
</div>
7979
</div>
80-
<p>Enter a code to connect to a remote screen</p>
80+
<p>Enter a code to connect to a remote screen.</p>
8181
</div>
8282

8383
</main>

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="icon" type="image/png" src="img/[email protected]">
1212
</head>
1313
<body class="wi-100">
14-
<header class="bb b--light-gray pvm">
14+
<header class="main-header bb b--light-gray pvm">
1515
<div class="center mw8 phm phl-ns">
1616
<h1 class="f3 book dib prm man">ScreenCat</h1>
1717
</div>

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start": "electron electron.js",
88
"build": "electron-packager . ScreenCat --platform=darwin --arch=x64 --version=0.34.2 --protocol-name=\"ScreenCat URL\" --protocol=\"screencat\" --ignore=node_modules/electron-prebuilt --ignore=node_modules/electron-packager --ignore=node_modules/browserify --ignore=node_modules/wzrd --ignore=node_modules/standard && cp img/Icon.icns ScreenCat.app/Contents/Resources/atom.icns",
99
"dev": "wzrd remote.js:remote-bundle.js",
10-
"css": "node-sass stylesheets/sass/screencat.scss stylesheets/css/screencat.css",
10+
"css": "node-sass stylesheets/sass/screencat.scss stylesheets/css/screencat.css --watch",
1111
"test": "standard"
1212
},
1313
"author": "max ogden",

remote.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<body class="wi-100">
2929

3030
<div class="content-container">
31-
<header class="bb b--light-gray pvm">
31+
<header class="main-header bb b--light-gray pvs">
3232
<div class="center mw8 phm phl-ns">
3333
<h1 class="f3 book dib prm man">ScreenCat</h1>
3434
<div class="fr">
@@ -41,7 +41,7 @@ <h1 class="f3 book dib prm man">ScreenCat</h1>
4141
<h2 class="f4 ttu book cl">join</h2>
4242
<div class="cr">
4343
<div class="w-80 left prl">
44-
<input class="code-paste-input pam brs ba b--light-gray w-100 mw-fill"></input>
44+
<input type="text" class="code-paste-input brs ba b--light-gray w-100 mw-fill"></input>
4545
</div>
4646
<div class="w-20 left">
4747
<div class="code-paste-button tc phs pvs pvm-ns f4 btn w-100 mw-fill">Connect</div>

stylesheets/css/screencat.css

+32-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
11
@charset "UTF-8";
2+
body {
3+
background-color: #F7F7F7;
4+
color: #222; }
5+
6+
input {
7+
outline: none;
8+
padding: 15px 25px; }
9+
10+
input[type="text"],
11+
input[type="tel"],
12+
input[type="url"],
13+
input[type="email"],
14+
input[type="search"],
15+
input[type="number"],
16+
input[type="password"] {
17+
border: 1px solid #DEDEDE;
18+
border-radius: 4px; }
19+
input[type="text"]:focus,
20+
input[type="tel"]:focus,
21+
input[type="url"]:focus,
22+
input[type="email"]:focus,
23+
input[type="search"]:focus,
24+
input[type="number"]:focus,
25+
input[type="password"]:focus {
26+
border: 1px solid #539be2; }
27+
28+
.main-header {
29+
background: -webkit-linear-gradient(top, #FFFFFF 0%, #F0F0F0 100%);
30+
border-bottom: 1px solid #D3D3D3;
31+
box-shadow: 0 1px 2px rgba(235, 235, 235, 0.8); }
32+
233
.left {
334
float: left;
435
display: block; }
@@ -36,7 +67,7 @@
3667
color: #222;
3768
background-color: transparent; }
3869
.btn-plain:active {
39-
color: #999; }
70+
color: #ccc; }
4071

4172
.back-button:before {
4273
position: absolute;

stylesheets/sass/screencat.scss

+32-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,37 @@ $button-color: #539be2;
22
$button-active: #3085db;
33
$button-border-color: #3f74a8;
44

5+
body {
6+
background-color: #F7F7F7;
7+
color: #222;
8+
}
9+
10+
input {
11+
outline: none;
12+
padding: 15px 25px;
13+
}
14+
15+
input[type="text"],
16+
input[type="tel"],
17+
input[type="url"],
18+
input[type="email"],
19+
input[type="search"],
20+
input[type="number"],
21+
input[type="password"] {
22+
border: 1px solid #DEDEDE;
23+
border-radius: 4px;
24+
25+
&:focus {
26+
border: 1px solid $button-color;
27+
}
28+
}
29+
30+
.main-header {
31+
background: -webkit-linear-gradient(top, #FFFFFF 0%, #F0F0F0 100%);
32+
border-bottom: 1px solid #D3D3D3;
33+
box-shadow: 0 1px 2px rgba(#EBEBEB, .8);
34+
}
35+
536
.left {
637
float: left;
738
display: block;
@@ -49,7 +80,7 @@ $button-border-color: #3f74a8;
4980
}
5081

5182
&:active {
52-
color: #999;
83+
color: #ccc;
5384
}
5485
}
5586

0 commit comments

Comments
 (0)