From be0fae1f31b806c590b69bc83b114743c5fd524a Mon Sep 17 00:00:00 2001 From: WING TSAN W CHENG Date: Tue, 24 Mar 2015 07:44:44 +0800 Subject: [PATCH 1/3] progress of bootstrap --- .DS_Store | Bin 0 -> 6148 bytes css/custom.css | 19 ++++++ index.html | 158 +++++++++++++++++++++++++++++++++++++++--------- testing.html | 161 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 309 insertions(+), 29 deletions(-) create mode 100644 .DS_Store create mode 100644 testing.html diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d7fbe0db5779d87c5e8ad5fc23e19d16b93790b4 GIT binary patch literal 6148 zcmeHKJ5B>J5Pg#b6rf2-xg}L3Zm>ifBnp~v0Z10{(L#!VM7hV{P#l2Uz?&I^@Mdcy z(2Qh1+w)obN$c?dklAy63`_uw*%UpUuS*RMZz&1pz55DWwZ!9XyOF~FRyGCpvOJ{SlFf`M-a^nNJV6w8FI zqg@^BtOOvAxNO3)J^qP>E)dIvts_?`;;uw@l~iI#svX4LsV|d#>*($f`!eICFMky; zl1dLL%p6iWMjs3W133djpH4LY&-p9$7WuhL%z}Yn;GZ!dqw1oX@lYwZZXHi^ZNYZQ urlNMO4k#R3DkfSg=0xw2LsPoG&@uI8!q!ov=(@QR;~`*#L>CPF0t27e=Sk@R literal 0 HcmV?d00001 diff --git a/css/custom.css b/css/custom.css index 6e7ce8b..ec76246 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1 +1,20 @@ +/*.jumbotron { + border-style: 10px solid red; +}*/ +/*body {background: lightgrey;} +*/ +.pink {background-color: pink;} +.blue {background-color: blue;} +.grey {background-color: grey;} +.white {background-color: white; + /*border: 5px solid grey}*/ +.green {background-color: green;} +.purple {background-color: purple;} +.yellow {background-color: yellow;} +.red {background-color: red;} +.byben1 {font-style: italic; } +.xxx { + border-style: 10px solid red; +} + /* You can include your custom styling here */ \ No newline at end of file diff --git a/index.html b/index.html index ce15d9c..bfabfda 100644 --- a/index.html +++ b/index.html @@ -11,16 +11,18 @@ The Next Web + + - + + - - - + + -
-
-
- - - -
-
-

News Content

+ +
HELLO +
+ +
+ +
+ + + + +
+
+
+ +

+ By + BEN WOODS + 20-Nov- '14 +

+

Square officially launches its Register software platform worldwide

+
+ + Square has today announced that its point-of-sale (POS) software Square Register is now available globally, having previously been restricted to users in the US, Canada and Japan. Announced at The Financial... + + Keep Reading -> +
+
+
+
+ +

+ By + JORY MACKAY + 20-Nov- '14 +

+

The weird science of first impressions

+
+ +

+ By + PAUL SAWERS + 20-Nov- '14 +

+

Adidas now lets Americans print photos on their sneakers too

+
+
+
+ + + + +
+
WHAT
+
+
Red
+
Green
+
+
+
+ + @@ -86,4 +148,42 @@

News Content

- \ No newline at end of file + + + + + \ No newline at end of file diff --git a/testing.html b/testing.html new file mode 100644 index 0000000..55bfe96 --- /dev/null +++ b/testing.html @@ -0,0 +1,161 @@ + + + + + + + + + + + + The Next Web + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+
+
+ + + +

+ By + BBBEN WOODS + 20-Nov- '14 +

+

Square officially launches its Register software platform worldwide

+
+ + Square has today announced that its point-of-sale (POS) software Square Register is now available globally, having previously been restricted to users in the US, Canada and Japan. Announced at The Financial... + + Keep Reading -> +
+
+
+
+ +

+ By + JORY MACKAY + 20-Nov- '14 +

+

The weird science of first impressions

+
+
+ +

+ By + PAUL SAWERS + 20-Nov- '14 +

+

Adidas now lets Americans print photos on their sneakers too

+
+
+
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + \ No newline at end of file From e8ed60c8db351f12b8f6e79a6af80691539076a3 Mon Sep 17 00:00:00 2001 From: WING TSAN W CHENG Date: Tue, 24 Mar 2015 12:03:04 +0800 Subject: [PATCH 2/3] bootstrap homework --- .DS_Store | Bin 6148 -> 6148 bytes css/custom.css | 47 ++++++++++++++++++++------- index.html | 84 ++++++++++++++++++++++--------------------------- 3 files changed, 73 insertions(+), 58 deletions(-) diff --git a/.DS_Store b/.DS_Store index d7fbe0db5779d87c5e8ad5fc23e19d16b93790b4..945e6305d936e98f451860e111018e875c37bd7e 100644 GIT binary patch delta 97 zcmZoMXfc=|#>B)qu~2NHo+2aL#DLw4m>3z^Ci5`Xu`n<&Fi!4cjOFKHC}ButCAA%zQg#LWivYmKL^l&%^w-RGf(ChvE*O`>H_Ly*c>3Tg&6>R>lW7l delta 75 zcmZoMXfc=|#>B`mu~2NHo+2ab#DLw5tdn_|>RA2*!Q?)s*v)Fp4_P)gSTk;B=iui6 cD&4He{GE9+zlbFV0}wDWFfeTn5ZS^E0CsK_1ONa4 diff --git a/css/custom.css b/css/custom.css index ec76246..09825f4 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3,18 +3,41 @@ }*/ /*body {background: lightgrey;} */ -.pink {background-color: pink;} -.blue {background-color: blue;} -.grey {background-color: grey;} +.pink {background-color: pink; + } +.blue {background-color: blue; + } +.grey {background-color: #F8F8F8 ; + } .white {background-color: white; - /*border: 5px solid grey}*/ -.green {background-color: green;} -.purple {background-color: purple;} -.yellow {background-color: yellow;} -.red {background-color: red;} -.byben1 {font-style: italic; } -.xxx { - border-style: 10px solid red; + border: 1px solid lightgrey; + } +.green {background-color: green; + } +.purple {background-color: purple; + } +.yellow {background-color: yellow; + } +.red {background-color: red; + color: red; + } +.byben1 {font-style: italic; + } +.support { + margin: 15px auto; } +'' +/* You can include your custom styling here */ -/* You can include your custom styling here */ \ No newline at end of file + +
+
WHAT
+
+
Red
+
Green
+
+
+
+ + + \ No newline at end of file diff --git a/index.html b/index.html index bfabfda..36fe3bf 100644 --- a/index.html +++ b/index.html @@ -11,19 +11,16 @@ The Next Web - - - - - + - - + + + + -
HELLO -
- -
- -
+
- - +
+ + + +
-
-
+

- By - BEN WOODS - 20-Nov- '14 + By + BEN WOODS + 20-Nov- '14

Square officially launches its Register software platform worldwide

@@ -99,24 +95,25 @@

Square officially launches its Register software platform worldwide

Square has today announced that its point-of-sale (POS) software Square Register is now available globally, having previously been restricted to users in the US, Canada and Japan. Announced at The Financial... Keep Reading -> +

- By - JORY MACKAY - 20-Nov- '14 + By + JORY MACKAY + 20-Nov- '14

The weird science of first impressions

- By - PAUL SAWERS - 20-Nov- '14 + By + PAUL SAWERS + 20-Nov- '14

Adidas now lets Americans print photos on their sneakers too

@@ -126,18 +123,13 @@

Adidas now lets Americans print photos on their sneakers too

- - -
-
WHAT
-
-
Red
-
Green
-
-
- +
+
+

Place sticky footer content here.

+
+
From 9e12bda70c5f9d6a9475dca02baad662a9109f12 Mon Sep 17 00:00:00 2001 From: WING TSAN W CHENG Date: Tue, 24 Mar 2015 13:13:26 +0800 Subject: [PATCH 3/3] updated BootSt --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 36fe3bf..2143060 100644 --- a/index.html +++ b/index.html @@ -76,7 +76,7 @@
-