Projekt

Obecné

Profil

« Předchozí | Další » 

Revize aee27358

Přidáno uživatelem Marek Zábran před téměř 5 roky(ů)

Issue #7849 @1.5h
Předělání fontů na proměnné.
Přidání špedlíku v loginu u špatného hesla/mailu - ještě je špatně odsazení textu a celého špendlíku + je třeba to samé dát do registrace.
Předělání ostatních chybových hlášek (e-mail nesedící na e-mail reg-exe) zatím chybí.

Zobrazit rozdíly:

resources/sass/_custom.scss
1 1
// Ready for custom styling
2 2

  
3 3
body {
4
    //font-family: 'Nunito Sans', sans-serif;
5 4
    background-color: $theme-color-five;
6 5

  
7 6
    .head-title h1 {
8 7
        color: $theme-color-one;
9
        font-family: Avenir;
8
        font-family: $font-family-avenir-roman;
10 9
        font-size: 60pt;
11 10
        font-weight: bold;
12 11
        letter-spacing: 3px;
......
60 59
            background-color:  rgba(239, 218, 179, 0.5);
61 60

  
62 61
            /*h2 {
63
                font-family: Avenir Black;
62
                font-family: $font-family-avenir-black;
64 63
                font-size: 11pt;
65 64
                letter-spacing: 3pt;
66 65
                color: $white;
......
77 76
    /////////text types
78 77
    //většina běžných textů
79 78
    .text {
80
        font-family: Avenir Roman;
79
        font-family: $font-family-avenir-roman;
81 80
        font-size: 8pt;
82 81
        line-height: 9pt;
83 82
    }
84 83

  
85 84
    //text inputu a název artefaktů
86 85
    .text2{
87
        font-family: Avenir Medium;
86
        font-family: $font-family-avenir-medium;
88 87
        font-size: 8pt;
89 88
    }
90 89

  
......
92 91
    .kaplicky{
93 92
        color: $theme-color-one;
94 93
        font-size: 11pt;
95
        font-family: Avenir Black;
94
        font-family: $font-family-avenir-black;
96 95
        letter-spacing: 3pt;
97 96
    }
98 97

  
99 98
    //autor artefaktu
100 99
    .text-author{
101
        font-family: Avenir Roman;
100
        font-family: $font-family-avenir-roman;
102 101
        font-size: 7pt;
103 102
        color: $theme-color-four;
104 103
    }
105 104

  
106 105
    //počet lajků
107 106
    .text-number{
108
        font-family: Avenir Medium;
107
        font-family: $font-family-avenir-medium;
109 108
        font-size: 5pt;
110 109
        color: $theme-color-four;
111 110
    }
112 111

  
113 112
    //notes u metadat, about v about, text levého menu
114 113
    .text-headline{
115
        font-family: Avenir Medium;
114
        font-family: $font-family-avenir-medium;
116 115
        font-size: 12pt;
117 116
        color: $theme-color-four;
118 117
    }
119 118

  
120 119
    //název metadata, text pravého menu
121 120
    .text-page{
122
        font-family: Avenir Medium;
121
        font-family: $font-family-avenir-medium;
123 122
        font-size: 7pt;
124 123
    }
125 124

  
125
    ////color pro změnu jen barvy
126
    .black{
127
        color: $theme-color-five;
128
    }
129
    .white{
130
        color: $theme-color-one;
131
    }
132
    .colored{
133
        color: $theme-color-four;
134
    }
135

  
126 136

  
127 137
    ////login
128 138
    .auth{
......
140 150
        .form-control{
141 151
            padding: 0px;
142 152
            height: 17pt;
143
            //font-family: Avenir Medium;
144
            //font-size: 8pt;
145 153
        }
146 154
    }
147 155

  
148 156
    .card-body {
149 157
    	background-color: $theme-color-five;
150
    	font-family: Avenir Roman;
158
    	font-family: $font-family-avenir-roman;
151 159
    	color: $theme-color-four;
152 160

  
153 161
	}
......
188 196
        border-radius: 0;
189 197
        width: 6.5rem;
190 198
        height: 2rem;
191
        font-family: Avenir Roman;
199
        font-family: $font-family-avenir-roman;
192 200

  
193 201
        &:active, &:focus, &:visited {
194 202
            outline: none;
......
196 204
        }
197 205
    }
198 206

  
207
    //spendlik
208
    .pin-left:before {
209
        content: '';
210
        position: relative;
211
        height: 0.35433rem;
212
        width: 0.35433rem;
213
        background-color: $theme-color-one;
214
        border-radius: 50%;
215
        display: inline-block;
216
        top: -0.35433rem;
217
        left: -0.2rem;
218

  
219
    }
220

  
221
    .pin-left {
222
        border-left: .5pt solid $theme-color-four;
223
        display: inline-block;
224
        margin: 50px;
225
        height: 200px;
226
        text-align: left;
227
        width: 100%;
228
    }
229

  
199 230
    .button-image {
200 231
        background-color: transparent;
201 232
        border-color: transparent;
......
258 289
            color:$theme-color-four;
259 290
            outline: none !important;
260 291
            box-shadow: none !important;
261
            font-family: Avenir Medium;
292
            font-family: $font-family-avenir-medium;
262 293

  
263 294
            &:active
264 295
            {
......
289 320
    }
290 321
}
291 322

  
323
@media (max-width: 990px) {
324
    body {
325
        .pin-left {
326
            margin-left: 0px;
327
        }
328
    }
329
}
330

  
292 331
@media only screen and (max-width: 540px)
293 332
{
294 333

  
334

  
295 335
    .head-title.text-center h1
296 336
    {
297 337
        font-size: 45pt;
resources/sass/_variables.scss
2 2
$body-bg: #f8fafc;
3 3

  
4 4
// Typography
5
$font-family-sans-serif: 'Nunito', sans-serif;
5
//$font-family-sans-serif: 'Nunito', sans-serif;
6 6
$font-size-base: 0.9rem;
7 7
$line-height-base: 1.6;
8
$font-family-avenir-roman: Avenir Roman;
9
$font-family-avenir-medium: Avenir Medium;
10
$font-family-avenir-black: Avenir Black;
8 11

  
9 12
// Colors
10 13
$blue: #3490dc;
resources/views/auth/login.blade.php
26 26
                            <div class="col-md-6">
27 27
                                <input id="email" type="email" class="form-control text2 @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
28 28

  
29
                                @error('email')
30
                                    <span class="invalid-feedback" role="alert">
31
                                        <strong>{{ $message }}</strong>
32
                                    </span>
33
                                @enderror
29

  
34 30
                            </div>
35 31
                        </div>
36 32

  
......
40 36
                            <div class="col-md-6">
41 37
                                <input id="password" type="password" class="form-control text2 @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
42 38

  
43
                                @error('password')
44
                                    <span class="invalid-feedback" role="alert">
45
                                        <strong>{{ $message }}</strong>
46
                                    </span>
47
                                @enderror
39

  
48 40
                            </div>
49 41
                        </div>
50 42

  
......
71 63
                                    </a>
72 64
                                @endif --}}
73 65
                            </div>
66

  
67
                            <div class="col-md-6 offset-md-2">
68
                             @error('email')
69
                                <span class="text white pin-left" role="alert">
70
                                             <text>{{ $message }}</text>
71
                                </span>
72
                             @enderror
73

  
74
                             @error('password')
75
                                <span class="text white pin-left" role="alert">
76
                                            <text>{{ $message }}</text>
77
                                </span>
78
                             @enderror
79
                            </div>
74 80
                    </form>
75 81
                </div>
76 82
            </div>

Také k dispozici: Unified diff