webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Added social sign in

Browse Source
This commit is contained in:
Dan Brown
2015-09-04 17:16:58 +01:00
parent 48814b8984
commit 2dcc5105ad
20 changed files with 578 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/assets/js/global.js
View File

@@ -3,6 +3,7 @@ $(function () {
// Notification hiding
$('.notification').click(function () {
$(this).fadeOut(100);
});
// Dropdown toggles

14
resources/assets/sass/_animations.scss
View File

@@ -42,6 +42,9 @@
animation-duration: 3s;
animation-timing-function: ease-in-out;
animation-fill-mode: forwards;
&.stopped {
animation-name: notificationStopped;
}
}
@keyframes notification {
@@ -58,6 +61,17 @@
transform: translate3d(580px, 0, 0);
}
}
@keyframes notificationStopped {
0% {
transform: translate3d(580px, 0, 0);
}
10% {
transform: translate3d(0, 0, 0);
}
100% {
transform: translate3d(0, 0, 0);
}
}
@keyframes menuIn {
from {

1
resources/assets/sass/_buttons.scss
View File

@@ -30,7 +30,6 @@ $button-border-radius: 2px;
border-radius: $button-border-radius;
cursor: pointer;
transition: all ease-in-out 120ms;
text-transform: uppercase;
box-shadow: 0 0.5px 1.5px 0 rgba(0, 0, 0, 0.21);
@include generate-button-colors(#EEE, $primary);
}

12
resources/views/auth/login.blade.php
View File

@@ -1,6 +1,6 @@
@extends('public')
@section('sidebar')
@section('content')
<div class="center-box">
<h1>Log In</h1>
@@ -23,6 +23,16 @@
<button class="button block pos">Sign In</button>
</div>
</form>
@if(count($socialDrivers) > 0)
<hr class="margin-top">
<h3 class="text-muted">Social Login</h3>
@if(isset($socialDrivers['google']))
<a href="/login/service/google" style="color: #DC4E41;"><i class="zmdi zmdi-google-plus-box zmdi-hc-4x"></i></a>
@endif
@if(isset($socialDrivers['github']))
<a href="/login/service/github" style="color:#000;"><i class="zmdi zmdi-github zmdi-hc-4x"></i></a>
@endif
@endif
</div>
@stop

2
resources/views/auth/password.blade.php
View File

@@ -2,7 +2,7 @@
@section('body-class', 'image-cover login')
@section('sidebar')
@section('content')
<div class="text-center">

2
resources/views/auth/reset.blade.php
View File

@@ -2,7 +2,7 @@
@section('body-class', 'image-cover login')
@section('sidebar')
@section('content')
<div class="text-center">

2
resources/views/base.blade.php
View File

@@ -31,7 +31,7 @@
@endif
@if(Session::has('error'))
<div class="notification anim neg">
<div class="notification anim neg stopped">
<i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
</div>
@endif

17
resources/views/public.blade.php
View File

@@ -6,14 +6,25 @@
<link rel="stylesheet" href="/css/app.css">
<link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css">
<!-- Scripts -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="/js/common.js"></script>
</head>
<body class="@yield('body-class')">
<section id="sidebar">
@yield('sidebar')
</section>
@if(Session::has('success'))
<div class="notification anim pos">
<i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
</div>
@endif
@if(Session::has('error'))
<div class="notification anim neg stopped">
<i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
</div>
@endif
<section class="container">
@yield('content')

14
resources/views/users/form.blade.php
View File

@@ -8,6 +8,13 @@
@include('form/text', ['name' => 'email'])
</div>
@if($currentUser->can('user-update'))
<div class="form-group">
<label for="role">User Role</label>
@include('form.role-select', ['name' => 'role', 'options' => \Oxbow\Role::all(), 'displayKey' => 'display_name'])
</div>
@endif
@if(isset($model))
<div class="form-group">
<span class="text-muted">
@@ -16,13 +23,6 @@
</div>
@endif
@if($currentUser->can('user-update'))
<div class="form-group">
<label for="role">User Role</label>
@include('form.role-select', ['name' => 'role', 'options' => \Oxbow\Role::all(), 'displayKey' => 'display_name'])
</div>
@endif
<div class="form-group">
<label for="password">Password</label>
@include('form/password', ['name' => 'password'])