Merge remote-tracking branch 'refs/remotes/origin/master'
commit
3a45191da3
|
@ -1,7 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="" />
|
||||
<list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/content/includes/css.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/includes/css.blade.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"/>
|
||||
<style>
|
||||
body{
|
||||
background-color: rgba(218, 211, 227, 0.65);
|
||||
background-color: #f1f4f7;
|
||||
}
|
||||
.card{
|
||||
background-color: #f0e4f45c;
|
||||
|
|
Loading…
Reference in New Issue