Skip to content

Commit 7da817a

Browse files
committed
Merge branch 'develop'
2 parents bbdbc13 + 66d7bce commit 7da817a

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

public/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<meta name="viewport" content="width=device-width,initial-scale=1.0">
88
<meta name="description" content="The best app for quickly weather check and for you and everyone">
99
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
10-
<title>Weatherffy</title>
10+
<title>Vue Weather App</title>
1111
<!--Import Google Icon Font-->
12-
<link href="https://fonts.googleapis.com/css?family=Poppins:500,600|Roboto:400,500&display=swap" rel="stylesheet">
12+
<link href="https://fonts.googleapis.com/css?family=Poppins:500,600|Roboto:400,500,700&display=swap" rel="stylesheet">
1313
<link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined" rel="stylesheet">
1414
<!--Styles-->
1515
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"

src/App.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div id="app">
3-
<nav class="navbar navbar-expand-lg navbar-dark bg-dark d-none d-sm-none d-sm-block">
3+
<nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top d-none d-sm-none d-sm-block">
44
<div class="container">
55
<a class="navbar-brand" href="#">
66
<img src="../src/assets/logo.png" width="30" height="30" class="d-inline-block align-top" alt="Vue Logo">
@@ -27,14 +27,14 @@
2727
<div class="row text-center">
2828
<div class="col-6">
2929
<router-link to="/" class="active">
30-
<i class="material-icons-outlined">home</i><br>
31-
Weather
30+
<i class="material-icons" style="font-size: 32px">home</i><br>
31+
3232
</router-link>
3333
</div>
3434
<div class="col-6">
3535
<router-link to="/about" class="">
36-
<i class="material-icons-outlined">cloud_download</i><br>
37-
API
36+
<i class="material-icons" style="font-size: 32px">cloud_download</i><br>
37+
3838
</router-link>
3939
</div>
4040
</div>
@@ -51,9 +51,9 @@
5151
/////////////////////// - VARIABLES - ///////////////////////
5252
5353
// background-color
54-
$bg-primary-light: #eaebff;
55-
$bg-primary: #304ffe;
56-
$bg-primary-dark: #1e3ae5;
54+
$bg-primary-light: #ffa689;
55+
$bg-primary: #ff815a;
56+
$bg-primary-dark: #ff6334;
5757
$bg-secondary: #ffab00;
5858
$bg-success-light: #cdffd6;
5959
$bg-warning-light: #fdfcb8;
@@ -67,9 +67,9 @@
6767
$bg-blue-gradient: linear-gradient(to right, #4497f5, #75ddff);
6868
$bg-red-gradient: linear-gradient(to right, #f58080, #f5a1a1);
6969
// text-color
70-
$text-primary-light: #7a89ff;
71-
$text-primary: #304ffe;
72-
$text-primary-dark: #1e3ae5;
70+
$text-primary-light: #ffa689;
71+
$text-primary: #ff815a;
72+
$text-primary-dark: #ff6334;
7373
$text-secondary-light: #ffdc1c;
7474
$text-secondary: #ffab00;
7575
$text-secondary-dark: #fe7f00;

src/components/weatherWidget.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="row">
2727
<!-- TODAY -->
2828
<div class="col-6 col-md-2 mb-2">
29-
<div class="text-primary-light">TODAY</div>
29+
<div class="text-primary-light font-weight-bold">TODAY</div>
3030
</div>
3131
<!-- DATE -->
3232
<div class="offset-md-8 col-6 col-md-2 text-center mb-2">

0 commit comments

Comments
 (0)