-
Notifications
You must be signed in to change notification settings - Fork 299
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #258 from camicroscope/develop
For 3.6.1, bugfixes (testing and upload btn), and improvements
- Loading branch information
Showing
18 changed files
with
6,798 additions
and
677 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,91 @@ | ||
| /* signup.css */ | ||
|
|
||
|
|
||
| body { | ||
| color: #fff; | ||
| background: url(bg_img.jpg); | ||
| background-size: cover; | ||
| font-family: sans-serif; | ||
| color: #999; | ||
| background: #f5f5f5; | ||
| font-family: 'Roboto', sans-serif; | ||
| } | ||
| * { | ||
| box-sizing: border-box; | ||
| text-decoration: none; | ||
|
|
||
| .form-control, .form-control:focus, .input-group-addon { | ||
| border-color: #e1e1e1; | ||
| border-radius: 0; | ||
| } | ||
|
|
||
| .login-panel { | ||
| width: 320px; | ||
| /*height: 420px;*/ | ||
| background: rgba(0, 0, 0, 0.5); | ||
| top: 50%; | ||
| left: 50%; | ||
| position: absolute; | ||
| transform: translate(-50%, -50%); | ||
| border-radius: 15px; | ||
| padding:0 35px; | ||
| .signup-form { | ||
| width: 390px; | ||
| margin: 0 auto; | ||
| padding: 30px 0; | ||
| } | ||
| .login-panel h1 { | ||
| .signup-form h2 { | ||
| color: #636363; | ||
| margin: 0 0 15px; | ||
| text-align: center; | ||
| margin: 35px auto; | ||
| background: linear-gradient(120deg,#8e44ad, #3498db); | ||
| -webkit-background-clip: text; | ||
| -webkit-text-fill-color: transparent; | ||
| } | ||
|
|
||
| .txtb { | ||
| border-bottom: 2px solid #fff; | ||
| position: relative; | ||
| margin: 30px 0 0 0; | ||
| .signup-form .lead { | ||
| font-size: 14px; | ||
| margin-bottom: 30px; | ||
| text-align: center; | ||
| } | ||
|
|
||
|
|
||
| .txtb input { | ||
| font-size: 15px; | ||
| color: #fff; | ||
| border: none; | ||
| width: 100%; | ||
| outline: none; | ||
| background: none; | ||
| padding: 0 5px; | ||
| height: 40px; | ||
| .signup-form form { | ||
| border-radius: 1px; | ||
| margin-bottom: 15px; | ||
| background: #fff; | ||
| border: 1px solid #f3f3f3; | ||
| box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3); | ||
| padding: 30px; | ||
| } | ||
|
|
||
| input[type=radio] { | ||
| margin: 15px 10px 0 50px; | ||
| transition: .5s; | ||
| .signup-form .form-group { | ||
| margin-bottom: 20px; | ||
| } | ||
| input[type=radio]:checked+label { | ||
| color: #8e44ad; | ||
| font-weight: bold; | ||
| .signup-form label { | ||
| font-weight: normal; | ||
| font-size: 13px; | ||
| } | ||
| .bottom-text { | ||
| font-size: 12px; | ||
| padding-top: 7px; | ||
| .signup-form .form-control { | ||
| min-height: 38px; | ||
| box-shadow: none !important; | ||
| border-width: 0 0 1px 0; | ||
| } | ||
| .signup-form .input-group-addon { | ||
| max-width: 42px; | ||
| text-align: center; | ||
| background: none; | ||
| border-width: 0 0 1px 0; | ||
| padding-left: 5px; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| .sub-btn { | ||
| border-radius: 25px; | ||
| display: block; | ||
| width: 100%; | ||
| height: 35px; | ||
| .signup-form .btn { | ||
| font-size: 16px; | ||
| font-weight: bold; | ||
| background: #19aa8d; | ||
| border-radius: 3px; | ||
| border: none; | ||
| background: linear-gradient(120deg,rgba(52, 152, 219,.8), #8e44ad,rgba(52, 152, 219,.8)); | ||
| background-size: 200%; | ||
| color: #fff; | ||
| outline: none; | ||
| cursor: pointer; | ||
| transition: .5s; | ||
| margin-top: 10px; | ||
| min-width: 140px; | ||
| outline: none !important; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| .sub-btn:hover { | ||
| background-position: right; | ||
| .signup-form .btn:hover, .signup-form .btn:focus { | ||
| background: #179b81; | ||
| } | ||
| .signup-form a { | ||
| color: #19aa8d; | ||
| text-decoration: none; | ||
| } | ||
| .signup-form a:hover { | ||
| text-decoration: underline; | ||
| } | ||
| .signup-form .fa { | ||
| font-size: 21px; | ||
| } | ||
|
|
||
| .login-tips { | ||
| padding: 10px; | ||
| color: #8e44ad; | ||
| .link{ | ||
| letter-spacing: 0.02em; | ||
| text-transform: uppercase; | ||
| font-size: 0.99em; | ||
| font-weight: bold; | ||
| margin: 35px 0; | ||
| border-radius: 15px; | ||
| background: rgba(200, 214, 229,0.7); | ||
| /* width: 100px; | ||
| height: 100px; | ||
| position: absolute; | ||
| top:-50px; | ||
| left: calc(50% - 50px);*/ | ||
| } | ||
| color: #5e6875; | ||
| text-decoration:none; | ||
| padding-right: 0.7rem; | ||
| padding-left: 0.7rem; | ||
| margin-top: 0.2rem; | ||
| font-family: "Open Sans", Helvetica, sans-serif; | ||
| line-height: 1.8; | ||
| } | ||
|
|
Oops, something went wrong.