From 2cad83c3d5ba129818b74395dc405cc7a3773f1b Mon Sep 17 00:00:00 2001 From: doudoudzj Date: Fri, 16 Nov 2018 18:07:00 +0800 Subject: [PATCH] update --- about_crogram.php | 32 +++---- about_ifastnet.php | 29 ++++++ about_uiisc.php | 32 +++---- css/style.css | 229 +++++++++++++++++++++++++-------------------- help.php | 7 +- js/common.js | 22 ++--- js/npm.js | 13 --- lang.php | 33 +++---- legal_privacy.php | 7 -- legal_terms.php | 6 -- login.php | 11 +-- register_bak.php | 6 -- resetpass.php | 7 +- 13 files changed, 222 insertions(+), 212 deletions(-) create mode 100644 about_ifastnet.php delete mode 100644 js/npm.js diff --git a/about_crogram.php b/about_crogram.php index c1bf0cd..0939030 100644 --- a/about_crogram.php +++ b/about_crogram.php @@ -1,27 +1,27 @@ - <?=$title?> - About Crogram - + About Crogram - <?php echo $title;?> + - -
-
-

CROGRAM

-

About Crogram, Inc.

-
-
-
-
+ +
+
+

CROGRAM

+

About Crogram, Inc.

+
+
+
+
-
-
- +
+
+ \ No newline at end of file diff --git a/about_ifastnet.php b/about_ifastnet.php new file mode 100644 index 0000000..ea6eb26 --- /dev/null +++ b/about_ifastnet.php @@ -0,0 +1,29 @@ + + + + + + About Crogram - <?php echo $title;?> + + + + + +
+
+

iFastNet

+

About iFastNet, Inc.

+
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/about_uiisc.php b/about_uiisc.php index de6e8b0..f6cb345 100644 --- a/about_uiisc.php +++ b/about_uiisc.php @@ -1,26 +1,26 @@ - <?=$title?> - About UIISC - + About UIISC - <?php echo $title;?> + - -
-
-

UIISC

-

About UIISC

-
-
-
-
-
-
- + +
+
+

UIISC

+

About UIISC

+
+
+
+
+
+
+ \ No newline at end of file diff --git a/css/style.css b/css/style.css index 1978989..eb42161 100644 --- a/css/style.css +++ b/css/style.css @@ -1,192 +1,215 @@ * { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } input { - border: 0; - outline-width: 0 !important; + border: 0; + outline-width: 0 !important; } button { - outline-width: 0 !important; + outline-width: 0 !important; } body { - padding-top: 20px; - padding-bottom: 100px; - line-height: 1.5; - color: #000; - background-color: #fff; - outline: 0; - overflow-x: hidden; - overflow-y: auto; + padding-top: 20px; + padding-bottom: 100px; + line-height: 1.5; + color: #000; + background-color: #fff; + outline: 0; + overflow-x: hidden; + overflow-y: auto; } .section-wrap { - padding: 10px 0; + padding: 10px 0; } .section-wrap.title { - border-bottom: 1px solid; + border-bottom: 1px solid; } .home { - width: 100%; - height: 100%; - height: 100vh; - min-height: 100%; - position: relative; - color: #fff; - background: #0000008a; - background-image: url(../images/banner.jpg); - background-repeat: no-repeat; - background-size: cover; + width: 100%; + height: 100%; + height: 100vh; + min-height: 100%; + position: relative; + color: #fff; + background: #0000008a; + background-image: url(../images/banner.jpg); + background-repeat: no-repeat; + background-size: cover; } body.fixed-header-on { - padding-top: 0; + padding-top: 0; } .fixed-header-on .navbar-nav>li>a, .fixed-header-on .navbar-brand { - color: #fff; + color: #fff; } .fixed-header-on .navbar-nav>li>a:hover, .fixed-header-on .navbar-brand:hover { - color: #ffc400; + color: #ffc400; } .fixed-header-on .header { - background-color: rgba(0, 0, 0, 0); - border-color: rgba(0, 0, 0, 0); + background-color: rgba(0, 0, 0, 0); + border-color: rgba(0, 0, 0, 0); } .fixed-header-on .footer { - border-color: transparent; - background-color: transparent; - background: transparent; + border-color: transparent; + background-color: transparent; + background: transparent; } .home-banner { - position: absolute; - top: 50%; - left: 50%; - z-index: 20; - text-align: center; - -webkit-transform: translate(-50%, -50%); - -moz-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); + position: absolute; + top: 50%; + left: 50%; + z-index: 20; + text-align: center; + -webkit-transform: translate(-50%, -50%); + -moz-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); } .bs-docs-header { - position: relative; - padding: 30px 0; - color: #cdbfe3; - text-align: center; - text-shadow: 0 1px 0 rgba(0, 0, 0, .1); - background-color: #6f5499; - background-image: -webkit-gradient(linear, left top, left bottom, from(#563d7c), to(#6f5499)); - background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%); - background-image: -o-linear-gradient(top, #563d7c 0%, #6f5499 100%); - background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0); - background-repeat: repeat-x; + position: relative; + padding: 30px 0; + color: #cdbfe3; + text-align: center; + text-shadow: 0 1px 0 rgba(0, 0, 0, .1); + background-color: #6f5499; + background-image: -webkit-gradient(linear, left top, left bottom, from(#563d7c), to(#6f5499)); + background-image: -webkit-linear-gradient(top, #563d7c 0%, #6f5499 100%); + background-image: -o-linear-gradient(top, #563d7c 0%, #6f5499 100%); + background-image: linear-gradient(to bottom, #563d7c 0%, #6f5499 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#563d7c', endColorstr='#6F5499', GradientType=0); + background-repeat: repeat-x; } .bs-docs-header { - margin-bottom: 40px; - font-size: 20px; + margin-bottom: 40px; + font-size: 20px; } .bs-docs-header h1 { - margin-top: 0; - color: #fff; + margin-top: 0; + color: #fff; } .bs-docs-header p { - margin-bottom: 0; - font-weight: 300; - line-height: 1.4; + margin-bottom: 0; + font-weight: 300; + line-height: 1.4; } .bs-docs-header .container { - position: relative; + position: relative; } @media (min-width: 768px) { - .bs-docs-header { - padding-top: 60px; - padding-bottom: 60px; - font-size: 24px; - text-align: left; - } - .bs-docs-header h1 { - font-size: 60px; - line-height: 1; - } + .bs-docs-header { + padding-top: 60px; + padding-bottom: 60px; + font-size: 24px; + text-align: left; + } + + .bs-docs-header h1 { + font-size: 60px; + line-height: 1; + } } @media (min-width: 992px) { - .bs-docs-header h1, - .bs-docs-header p { - margin-right: 380px; - } + + .bs-docs-header h1, + .bs-docs-header p { + margin-right: 380px; + } } .terms_policies_menu ul { - list-style-type: circle; + list-style-type: circle; } .form-account { - max-width: 330px; - padding: 15px; - margin: 0 auto; + max-width: 330px; + padding: 15px; + margin: 0 auto; } .form-account .form-control { - position: relative; - height: auto; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: 10px; - font-size: 16px; + position: relative; + height: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 10px; + font-size: 16px; +} + +.form-account .form-control:focus { + z-index: 2; +} + +.form-account .checkbox { + margin-bottom: 10px; + font-weight: normal; +} + +.form-account input[type="text"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.form-account input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; } .form-domain { - max-width: 430px; - padding: 15px; - margin: 0 auto; + max-width: 430px; + padding: 15px; + margin: 0 auto; } .form-domain input { - color: #fff; - background: transparent; + color: #fff; + background: transparent; } .form-domain .form-control:hover { - color: #333; - background-color: #fff; - background-image: none; + color: #333; + background-color: #fff; + background-image: none; } @media (min-width: 300px) { - .form-domain { - min-width: 300px; - } + .form-domain { + min-width: 300px; + } } @media (min-width: 768px) { - .form-domain { - max-width: 530px; - } + .form-domain { + max-width: 530px; + } } @media (min-width: 992px) { - .form-domain { - max-width: 500px; - } + .form-domain { + max-width: 500px; + } } \ No newline at end of file diff --git a/help.php b/help.php index 377e6d3..677a688 100644 --- a/help.php +++ b/help.php @@ -11,12 +11,7 @@ -
-
-

-

-
-
+
diff --git a/js/common.js b/js/common.js index 246563d..dec1f3c 100644 --- a/js/common.js +++ b/js/common.js @@ -1,13 +1,13 @@ function setCookie(name, value, expires, path, domain, secure) { - var today = new Date(); - today.setTime(today.getTime()); - if (expires) { - expires = expires * 1000 * 60 * 60 * 24; - } - var expires_date = new Date(today.getTime() + (expires)); - document.cookie = name + '=' + escape(value) + - ((expires) ? ';expires=' + expires_date.toGMTString() : '') + //expires.toGMTString() - ((path) ? ';path=' + path : '') + - ((domain) ? ';domain=' + domain : '') + - ((secure) ? ';secure' : ''); + var today = new Date(); + today.setTime(today.getTime()); + if (expires) { + expires = expires * 1000 * 60 * 60 * 24; + } + var expires_date = new Date(today.getTime() + (expires)); + document.cookie = name + '=' + escape(value) + + ((expires) ? ';expires=' + expires_date.toGMTString() : '') + //expires.toGMTString() + ((path) ? ';path=' + path : '') + + ((domain) ? ';domain=' + domain : '') + + ((secure) ? ';secure' : ''); } \ No newline at end of file diff --git a/js/npm.js b/js/npm.js deleted file mode 100644 index bf6aa80..0000000 --- a/js/npm.js +++ /dev/null @@ -1,13 +0,0 @@ -// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. -require('../../js/transition.js') -require('../../js/alert.js') -require('../../js/button.js') -require('../../js/carousel.js') -require('../../js/collapse.js') -require('../../js/dropdown.js') -require('../../js/modal.js') -require('../../js/tooltip.js') -require('../../js/popover.js') -require('../../js/scrollspy.js') -require('../../js/tab.js') -require('../../js/affix.js') \ No newline at end of file diff --git a/lang.php b/lang.php index 16959a6..e39c352 100644 --- a/lang.php +++ b/lang.php @@ -1,23 +1,24 @@ language_area); $current_language = getCurrentLanguage(); // print_r($current_language); -function getCurrentLanguage() { - global $lang, $languages; - if (array_key_exists ( $lang->language_area, $languages )) { - return $lang->language_area; - } else if (array_key_exists ( $lang->language_country, $languages )) { - return $lang->language_country; - } else { - return 'en-US'; - } +function getCurrentLanguage() +{ + global $lang, $languages; + if (array_key_exists($lang->language_area, $languages)) { + return $lang->language_area; + } else if (array_key_exists($lang->language_country, $languages)) { + return $lang->language_country; + } else { + return 'en-US'; + } } -$language_file=$lang->getFileDir('language.php'); -include($language_file); +$language_file = $lang->getFileDir('language.php'); +include $language_file; diff --git a/legal_privacy.php b/legal_privacy.php index 6827f6e..fee4f5d 100644 --- a/legal_privacy.php +++ b/legal_privacy.php @@ -14,13 +14,6 @@ - -
diff --git a/legal_terms.php b/legal_terms.php index 28ad14e..fbd939b 100644 --- a/legal_terms.php +++ b/legal_terms.php @@ -13,12 +13,6 @@ -
diff --git a/login.php b/login.php index 15f979b..733d6ca 100644 --- a/login.php +++ b/login.php @@ -13,13 +13,12 @@ -
-