Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b875478

Browse files
DRSDavidSoftMartiUK
DRSDavidSoft
authored and
MartiUK
committed
Fixes #2 – Replaces lemonade.css with bootstrap v4 (#22)
* Added latest version to the downloads section Now in the downloads section the latest version is show. * fixed latest-version spacing * add git config * renamed file to appropriate name * replace lemonade.css with bootstrap v4 * add cmder-web initial demo * update links git-for-windows link * fix link * updates link * fix css .btn rule * update ruby version * Update cibuild disable external sites checking for htmlproofer * nits * nits fixed merged nit commits from release-pr into rewrite, thanks @Stanzilla * Remove workspace (#11) * Delete cmder.ico * Delete cmder-web.html * Delete bg.jpg * Delete font.css * Delete marlett.eot * Delete marlett.svg * Delete marlett.ttf * Delete marlett.woff * Delete marlett.woff2 * remove space on mobile * edit col on mobile
1 parent 450274d commit b875478

File tree

9 files changed

+257
-205
lines changed

9 files changed

+257
-205
lines changed

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
*.html text eol=crlf
4+
*.htm text eol=crlf
5+
*.css text eol=crlf
6+
*.js text eol=crlf
7+
*.md text eol=lf

‎.gitignore‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# =========================
2+
# Cmder.net Home page
3+
# =========================
4+
5+
# Reserved hidden directory
6+
.*_space
7+
8+
# =========================
9+
# Operating System Files
10+
# =========================
11+
12+
# Temporary files and directories
13+
*~
14+
*.tmp
15+
.directory
16+
17+
# OSX specific files
18+
.DS_Store
19+
.AppleDouble
20+
.LSOverride
21+
22+
# Thumbnails and image file caches
23+
._*
24+
Thumbs.db
25+
ehthumbs.db
26+
27+
# Folder config files
28+
Desktop.ini

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- 2.3.0
3+
- 2.5.1
44

55
before_script:
66
- chmod +x ./script/cibuild

‎css/main.css‎

Lines changed: 53 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
/* ==========================================================================
2-
HTML5 Boilerplate styles - h5bp.com (generated via initializr.com)
2+
_
3+
___ _ __ ___ __| | ___ _ __
4+
/ __| '_ ` _ \ / _` |/ _ \ '__|
5+
| (__| | | | | | (_| | __/ |
6+
\___|_| |_| |_|\__,_|\___|_|
7+
38
========================================================================== */
49

510
html, button, input, select, textarea {
@@ -21,35 +26,32 @@ body {
2126
font-family: 'Lato', Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
2227
line-height: 1.4;
2328
}
24-
.wrapper {
29+
body > div.container, body > div.container-fluid {
2530
margin: 2em auto;
2631
padding: 0 0 2em 0;
27-
width: 80%;
2832
background-color: #fff;
2933
-webkit-box-shadow: 0 0 8px 3px #eee;
3034
-moz-box-shadow: 0 0 8px 3px #eee;
3135
box-shadow: 0 0 8px 3px #eee;
3236
}
33-
@media (max-width: 480px) {
34-
.wrapper {
35-
width: 98%;
36-
}
37-
}
38-
.container {
37+
main > section {
3938
margin: 0 auto;
4039
widows: 100%;
4140
}
4241

42+
@media (max-width: 768px) {
43+
body > div.container, body > div.container-fluid {
44+
margin-top: 0;
45+
}
46+
}
47+
4348
/* -------------- Typography -------------- */
4449

4550
a {
4651
color: #1E90FF;
4752
}
48-
p {
49-
padding-left: 8px;
50-
}
5153
h2 {
52-
padding: 0 1em;
54+
padding: .5em 1em;
5355
color: #444;
5456
text-align: center;
5557
font-weight: 300;
@@ -82,35 +84,59 @@ h4 {
8284
font-size: 1.1em;
8385
text-rendering: optimizeLegibility;
8486
}
85-
button {
87+
.btn {
8688
display: block;
8789
padding: 12px 0;
8890
width: 100%;
8991
border: 1px solid #eee;
9092
border-radius: 4px;
91-
background-color: #C4C4C4;
92-
box-shadow: 1px 1px 1px 0px #ddd, inset 0 0 -3px rgba(0, 0, 0, 0.02);
93+
background-color: #888;
94+
box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.02) !important;
9395
color: #fff;
9496
text-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
9597
font-size: 1.1em;
98+
outline: none;
99+
text-decoration: none;
96100
-webkit-transition: background-color 0.3s;
97101
-moz-transition: background-color 0.3s;
98102
-ms-transition: background-color 0.3s;
99103
-o-transition: background-color 0.3s;
100104
transition: background-color 0.3s;
101105
}
102-
button:hover {
106+
.btn:active:focus {
107+
outline: none;
108+
box-shadow: none;
109+
}
110+
.btn.btn-default {
111+
border: 1px solid #eee;
112+
background-color: #C4C4C4;
113+
color: #eee;
114+
}
115+
.btn.btn-default:hover {
116+
border: 1px solid #eee;
103117
background-color: #ccc;
104-
box-shadow: 0px 0px 1px 0px #ddd;
118+
color: #eee;
105119
}
106-
button.gray {
107-
float: right;
120+
.btn.btn-default:active {
121+
border: 1px solid #eee;
122+
background-color: #bbb;
123+
color: #eee;
108124
}
109-
button.blue {
125+
.btn.btn-primary {
126+
border: 1px solid #eee;
110127
background-color: #3498db;
128+
color: #eee;
111129
}
112-
button.blue:hover {
130+
.btn.btn-primary:hover {
131+
border: 1px solid #eee;
113132
background-color: #5dade2;
133+
color: #eee;
134+
}
135+
.btn.btn-primary:active {
136+
/* the !important rule used to over-write bs's :disabled attr */
137+
border: 1px solid #eee !important;
138+
background-color: #1E90FF !important;
139+
color: #eee !important;
114140
}
115141

116142
/* -------------- Modules -------------- */
@@ -162,16 +188,17 @@ main {
162188
}
163189
.information p {
164190
margin: 0;
165-
padding: 0 8px;
191+
padding: 0 .5em;
192+
padding-bottom: 3em;
166193
line-height: 1.4em;
167194
}
168195
.download {
169196
padding-top: 1.2em;
170197
max-width: 35em;
171198
text-align: center;
172199
}
173-
.download > .bit-2 {
174-
margin: 1.5em 0 0 0;
200+
.download > .github {
201+
margin-bottom: 1.5em;
175202
}
176203
#installation {
177204
text-align: left;
@@ -188,6 +215,7 @@ footer {
188215
code {
189216
padding: 1px 3px;
190217
border-radius: 2px;
218+
color: #222;
191219
background-color: #eee;
192220
font-size: 0.9em;
193221
font-family: Consolas, monaco, monospace;
@@ -204,51 +232,3 @@ ul ol {
204232
padding: 0 0 0 30px;
205233
list-style: none;
206234
}
207-
208-
/* lemonade.css */
209-
210-
*, *:after, *:before {
211-
margin: 0;
212-
padding: 0;
213-
box-sizing: border-box
214-
}
215-
.container:after {
216-
content: "";
217-
display: table;
218-
clear: both
219-
}
220-
.bit-1 {
221-
width: 100%
222-
}
223-
.bit-2 {
224-
width: 50%
225-
}
226-
.bit-3 {
227-
width: 33.33%;
228-
}
229-
@media(max-width:480px) {
230-
.bit-1, .bit-2, .bit-3, {
231-
width: 100%
232-
}
233-
}
234-
@media(min-width:480px) and (max-width:800px) {
235-
.bit-1, .bit-2, .bit-3, .bit-5, .bit-7, .bit-9, .bit-11 {
236-
width: 100%
237-
}
238-
}
239-
@media(min-width:800px) and (max-width:1100px) {
240-
.bit-2, .bit-7 {
241-
width: 100%
242-
}
243-
}
244-
[class*='bit-'] {
245-
float: left;
246-
padding: 5px;
247-
}
248-
249-
/* Floats last ".bit-" to the right */
250-
251-
[class*='bit-']:last-of-type {
252-
padding-right: 5px;
253-
float: right;
254-
}

‎css/main.min.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎img/main.jpg‎

-169 KB
Binary file not shown.

‎img/Untitled-2.png‎ renamed to ‎img/main.png‎

File renamed without changes.

0 commit comments

Comments
 (0)